Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <ian@well-typed.com>
Fri, 25 Jan 2013 16:39:37 +0000 (16:39 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 25 Jan 2013 16:39:37 +0000 (16:39 +0000)
commite70ace2ec6c622139763c35fd83b9a37ca3e6ebb
treef10cd7d8b2bc73b4433176422350a4a58eb6b6bf
parent3f34919d66be6d2b6df0766a5a4492a359dab7e3
parent7e1ce38f9be0c91f7d3071c4b59b10ab69e9bbdb
Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base