Merge branch 'master' of https://github.com/neongreen/text
authorBryan O'Sullivan <bryano@fb.com>
Wed, 3 Dec 2014 17:20:25 +0000 (09:20 -0800)
committerBryan O'Sullivan <bryano@fb.com>
Wed, 3 Dec 2014 17:20:25 +0000 (09:20 -0800)
1  2 
Data/Text.hs

diff --cc Data/Text.hs
Simple merge