Merge branch 'master' into angerman/feature/build-info-flags
authorMoritz Angermann <moritz.angermann@gmail.com>
Tue, 12 Jan 2016 06:57:35 +0000 (14:57 +0800)
committerMoritz Angermann <moritz.angermann@gmail.com>
Tue, 12 Jan 2016 06:57:35 +0000 (14:57 +0800)
commit8dfe2b928d8e2d8eef9f45fb148764799e844257
treec6e9de41a56f427007e7c3640581ca85255e038b
parent5d4e18236b64fa400a66967cd7dbb8371b0e08b7
parent27f303f3cedbd506c7373318e4f785354dc6ddaf
Merge branch 'master' into angerman/feature/build-info-flags

# Conflicts:
# src/Main.hs
shaking-up-ghc.cabal
src/Main.hs