Merge branch 'master' of git://git.haskell.org/ghc
authorAndreas Voellmy <andreas.voellmy@gmail.com>
Mon, 9 Mar 2015 22:27:54 +0000 (18:27 -0400)
committerAndreas Voellmy <andreas.voellmy@gmail.com>
Mon, 9 Mar 2015 22:27:54 +0000 (18:27 -0400)

Trivial merge