Alejandro Serrano 6302d4882e Merge remote-tracking branch 'kazu/master' ... Conflicts: Language/Haskell/GhcMod/Check.hs Language/Haskell/GhcMod/FillSig.hs Language/Haskell/GhcMod/GHCApi.hs		2014-07-18 17:12:52 +02:00
..
Haskell	Merge remote-tracking branch 'kazu/master'	2014-07-18 17:12:52 +02:00