Merge
authorBryan O'Sullivan <bos@serpentine.com>
Sun, 27 Apr 2014 23:56:44 +0000 (00:56 +0100)
committerBryan O'Sullivan <bos@serpentine.com>
Sun, 27 Apr 2014 23:56:44 +0000 (00:56 +0100)
1  2 
text.cabal

diff --cc text.cabal
Simple merge