Merge branch 'master' of http://darcs.haskell.org/packages/dph
authorAmos Robinson <amos.robinson@gmail.com>
Mon, 21 Jan 2013 05:48:47 +0000 (16:48 +1100)
committerAmos Robinson <amos.robinson@gmail.com>
Mon, 21 Jan 2013 05:48:47 +0000 (16:48 +1100)

Trivial merge