Merge branch 'master' of https://github.com/ndmitchell/shaking-up-ghc
authorNeil Mitchell <ndmitchell@gmail.com>
Wed, 17 Feb 2016 16:25:50 +0000 (16:25 +0000)
committerNeil Mitchell <ndmitchell@gmail.com>
Wed, 17 Feb 2016 16:25:50 +0000 (16:25 +0000)

Trivial merge