Merge pull request #551 from bos/v1.2.1.0

Bump to 1.2.1.0

Author: bergmark

aeson.cabal

@@ -1,5 +1,5 @@
 name:            aeson
-version:         1.2.0.0
+version:         1.2.1.0
 license:         BSD3
 license-file:    LICENSE
 category:        Text, Web, JSON

changelog.md

@@ -2,7 +2,11 @@ For the latest version of this document, please see [https://github.com/bos/aeso
 
 ## 1.2.1.0
 
-* Add `parserThrowError` and `parserCatchError` combinators.
+* Add `parserThrowError` and `parserCatchError` combinators, thanks to Oleg Grenrus.
+
+* Add `Generic` instance for `Value`, thanks to Xia Li-yao.
+
+* Fix a mistake in the 1.2.0.0 changelog, the `cffi` flag is disabled by default! Thanks to dbaynard.
 
 ## 1.2.0.0