Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/testsuite
authorRichard Eisenberg <eir@cis.upenn.edu>
Fri, 2 Aug 2013 14:59:19 +0000 (15:59 +0100)
committerRichard Eisenberg <eir@cis.upenn.edu>
Fri, 2 Aug 2013 14:59:19 +0000 (15:59 +0100)

Trivial merge