Merge branch 'master' of http://darcs.haskell.org//packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:31:06 +0000 (13:31 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:31:06 +0000 (13:31 +0000)
commit8fd36ef76a4ebdec6ba4f66f676974fb14c47017
tree90e9e0a74f2da5b9ba6681abc70c6ce181d457c4
parent24c3a710abec5c9ade58cdc564d2939076bc5abb
parent3b51b741f45d4d85e79b2128d00479ce230f72f2
Merge branch 'master' of darcs.haskell.org//packages/base