Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base
authorMax Bolingbroke <batterseapower@hotmail.com>
Sun, 3 Apr 2011 20:51:23 +0000 (21:51 +0100)
committerMax Bolingbroke <batterseapower@hotmail.com>
Sun, 3 Apr 2011 20:51:23 +0000 (21:51 +0100)
commit345ff2ccb5da1519562a89aec5009cbfa4617986
treeacd6fc79e344921e31499f714f04721b4d0cf0c5
parent4fcd348b68e4fd41b96288de1f58e31b1aa5807b
parentf5937ede7984724880a82d6bab56f81a5b1e1f80
Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base