Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <ian@well-typed.com>
Mon, 15 Oct 2012 20:52:59 +0000 (21:52 +0100)
committerIan Lynagh <ian@well-typed.com>
Mon, 15 Oct 2012 20:52:59 +0000 (21:52 +0100)
commit2c9452963971b72ce6c58baa2b20bd8461024cd3
tree69065a0c996e12766881478e528d0385fff1bee5
parentb6c9c353b973ac01f1d6723a1a32d3b07ed13a02
parent71f44c44af9074c76910939c2cd0cdc3b8c3c5e9
Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base