Merge branch 'master' of /home/simonmar/ghc-mirror/ghc
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 4 Nov 2011 10:23:59 +0000 (10:23 +0000)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 4 Nov 2011 10:23:59 +0000 (10:23 +0000)
commit76bce1b7f5f501626fbaf056e2dd23c6daaed33f
tree0c2236e2c8fdbaf4c70def26bfc186d4505c2f5c
parent76b5d7af3c6c916f9662c3b74182ccd4ae25977c
parentf699ccb4baef6ad3597451610cd78c3639236f3b
Merge branch 'master' of /home/simonmar/ghc-mirror/ghc