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)
commit37d34b23ebfedb728c87fd8a234a93d5b4737969
treeeb3868f1258ea7586f3caa6679cfc4d1380fd075
parente6133b8759891965638bdba564b837f2c59c50ae
parent0afc1273c6d05fefd3b6881d9f13a2bb5c7d0a90
Merge branch 'master' into 3.1.7_maint

Conflicts:
parsec.cabal
parsec.cabal