Merge branch 'master' of http://darcs.haskell.org/packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Dec 2012 09:50:04 +0000 (09:50 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 24 Dec 2012 09:50:04 +0000 (09:50 +0000)
commitf07215b83132b9bc9b0078a0e0940934319f3360
tree91fb000d5832ba502978644b50d992c90cde7cea
parentd9b6b25a30bfdaefb69c29dedb30eed06ae71e61
parent85bda3d6e36fb8b3d7121ccc01c8ccfc3942431f
Merge branch 'master' of darcs.haskell.org/packages/base