Merge branch 'master' of git://git.haskell.org/ghc
authorSjoerd Visscher <sjoerd@w3future.com>
Fri, 6 Jun 2014 12:31:51 +0000 (14:31 +0200)
committerSjoerd Visscher <sjoerd@w3future.com>
Fri, 6 Jun 2014 12:31:51 +0000 (14:31 +0200)
commit5c89f8802e8e1e1398705fcaf22f1af3ad24304a
treeb3344169277b7c77bd5c6020c7cb5f8ac6867bbb
parent63e1f0960c458787eabf8a54b3807021efe48640
parent7ac600d5fcd74db1f991555de6e415030970d5f3
Merge branch 'master' of git://git.haskell.org/ghc

Conflicts:
docs/users_guide/flags.xml
docs/users_guide/flags.xml
docs/users_guide/glasgow_exts.xml