Merge branch 'ghc-7.6' into ghc-7.6-merge-2

Conflicts:
	haddock.cabal
	src/Haddock/Interface/AttachInstances.hs
	src/Haddock/Interface/Create.hs
	src/Haddock/Interface/LexParseRn.hs
	src/Haddock/InterfaceFile.hs
	src/Haddock/Types.hs

Only GHC HEAD can compile this. GHC 7.6.x cannot compile this.

Some test fail.

1 files changed, 7 insertions, 0 deletions

diff --git a/driver/Main.hs b/driver/Main.hs
new file mode 100644
index 00000000..42b99860
--- /dev/null
+++ b/driver/Main.hs
@@ -0,0 +1,7 @@
+module Main where
+
+import           Documentation.Haddock (haddock)
+import           System.Environment (getArgs)
+
+main :: IO ()
+main = getArgs >>= haddock