Merge branch 'master' of git://github.com/haskell/pretty into ghc-head
authorHerbert Valerio Riedel <hvr@gnu.org>
Sun, 27 Oct 2013 15:49:37 +0000 (16:49 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Sun, 27 Oct 2013 15:49:37 +0000 (16:49 +0100)

Trivial merge