Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <ian@well-typed.com>
Fri, 30 Nov 2012 14:05:10 +0000 (14:05 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 30 Nov 2012 14:05:10 +0000 (14:05 +0000)
commitbab62355c09b1c07d53aa15b28e0893089049f8d
tree65987e164fd1c4eda2b225a3fc17b300ae23d561
parent151c2fc732beeddf0306af0d0b374e3029aea49e
parent8a7f4a18d5ab7bcc30f17d008f3c806b10984712
Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base