Daniel Gröber a2abad53ac Merge remote-tracking branch 'prezi/master' ... Conflicts: Language/Haskell/GhcMod/CabalHelper.hs		2015-05-20 11:37:17 +02:00
..
Haskell	Merge remote-tracking branch 'prezi/master'	2015-05-20 11:37:17 +02:00