Merge branch 'master' into 3.1.7_maint
authorAntoine Latter <aslatter@gmail.com>
Sat, 10 Jan 2015 02:44:02 +0000 (20:44 -0600)
committerAntoine Latter <aslatter@gmail.com>
Sat, 10 Jan 2015 02:44:02 +0000 (20:44 -0600)
Conflicts:
parsec.cabal

1  2 
parsec.cabal

diff --cc parsec.cabal
Simple merge