Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <ian@well-typed.com>
Fri, 10 Aug 2012 21:28:42 +0000 (22:28 +0100)
committerIan Lynagh <ian@well-typed.com>
Fri, 10 Aug 2012 21:28:42 +0000 (22:28 +0100)
commit6b2c2acbe747cb4c7695b3a9fed362bb5a693b52
tree766914c9a2cf79b373f093012921710667b06e47
parent5443ba94ce5d715741b9d7b5a696af8284e019e9
parent79d9ea6dcef04798dc047de50231ac064ff34722
Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base