Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/testsuite
authorRichard Eisenberg <eir@cis.upenn.edu>
Sun, 4 Aug 2013 16:33:17 +0000 (17:33 +0100)
committerRichard Eisenberg <eir@cis.upenn.edu>
Sun, 4 Aug 2013 16:33:17 +0000 (17:33 +0100)

Trivial merge