Daniel Gröber ceeea5d19f Merge branch 'master' (early part) into release ... Conflicts: Language/Haskell/GhcMod/Utils.hs		2014-10-30 01:12:28 +01:00
..
Haskell	Merge branch 'master' (early part) into release	2014-10-30 01:12:28 +01:00