Merge branch 'master' of git://git.haskell.org/ghc
authorIavor S. Diatchki <diatchki@galois.com>
Thu, 19 Mar 2015 21:35:30 +0000 (14:35 -0700)
committerIavor S. Diatchki <diatchki@galois.com>
Thu, 19 Mar 2015 21:35:30 +0000 (14:35 -0700)

Trivial merge