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)
commitc5c8fd34f2c8016f7b08ee76ec3ee5ce28d0219d
tree03e0c701798b6899105ba96edf090e7611abf409
parent0b8eada2d4d62dd09ee361d8b6ca9b13e6573202
parentb419701669900e2ebd8518b21a0b4bf5ac943e1b
Merge branch 'master' of git://github.com/haskell/pretty into ghc-head