Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 30 May 2013 19:40:10 +0000 (20:40 +0100)
committerIan Lynagh <ian@well-typed.com>
Thu, 30 May 2013 19:40:10 +0000 (20:40 +0100)
commit7849266ce2a9f45633d41532a07d870ea6a27fbb
treeee2f528f84e8e5b2192e79a6c8cda2f0e36425ed
parent26c7d94426825b95c3828d929b2630baf7d0e09b
parentac330cb607cde34bca6b6c4cf61d5b05000fe7e7
Merge branch 'master' of darcs.haskell.org/ghc