Daniel Gröber 690a64f5b5 Merge branch 'master' of https://github.com/robeverest/ghc-mod ... Conflicts: Language/Haskell/GhcMod/CabalConfig.hs		2014-09-12 05:21:12 +02:00
..
Haskell	Merge branch 'master' of https://github.com/robeverest/ghc-mod	2014-09-12 05:21:12 +02:00