Merge branch 'master' of http://darcs.haskell.org/packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 15 Aug 2012 13:24:52 +0000 (14:24 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 15 Aug 2012 13:24:52 +0000 (14:24 +0100)
commit53ed79af423772fbf912fe14349d9cbaf75a6228
tree4197dc0b7ab2a08102f4c1a39ddcae495ba5f049
parent6fb7bf8c9ba2a53d718a0d2a5f9e0f78cb7faf8f
parent36bc4549e7439f00cb020aab327bc4ee5e15ed7e
Merge branch 'master' of darcs.haskell.org/packages/base