Daniel Gröber be1185fc58 Merge branch 'master' into release ... Conflicts: elisp/ghc.el ghc-mod.cabal		2014-11-02 19:08:04 +01:00
..
Haskell	Merge branch 'master' into release	2014-11-02 19:08:04 +01:00