Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Sat, 22 Jun 2013 12:50:59 +0000 (13:50 +0100)
committerIan Lynagh <ian@well-typed.com>
Sat, 22 Jun 2013 12:50:59 +0000 (13:50 +0100)
commitf792ba4d34222fd19dd59ea7a9d2665547875fec
treee8183e6b1fc4742d773497123958e931e1715f1c
parent451e0dd875274aeb492a681bcdf944ab6deac39f
parentffe2e22c11518994108f1f319764fe898e899086
Merge branch 'master' of darcs.haskell.org/ghc