Merge branch 'master' of http://darcs.haskell.org/packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 15 Feb 2013 17:22:08 +0000 (17:22 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 15 Feb 2013 17:22:08 +0000 (17:22 +0000)
commitb5a32ba294f1f0a55416a6ce6750cdc1a935eb74
tree66386fe7011496be277acf12cb8e7ec8516e4b6b
parentea5ccf1764812c6364da1879307d19de2d99eba4
parent6cc46457095bad01837081bdaf815d980cba0ad9
Merge branch 'master' of darcs.haskell.org/packages/base