Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 13 Dec 2012 22:40:50 +0000 (22:40 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 13 Dec 2012 22:40:50 +0000 (22:40 +0000)
commitc79f733460c17d66853c184ccd1782d0be21b4dc
tree91f781ec37e7ba6ffbd2a130ec2cfa178992823f
parentab9de78dc557697c03f70b46f699a6520a7985ab
parent265af43ffd4411f4fced30ac866ef6bb49efec6c
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc