From f94d784f481b5d922ad142526feac7c28ed2def7 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 16 Apr 2014 17:28:30 -0700
Subject: [PATCH] changelog updates from release branch

give hledger-lib a changelog, update changelogs

(cherry picked from commit a67cee4e5f9e3dc09be86e7bc0e8fd77168a5070)

Conflicts:
	hledger/CHANGES

update changelogs

(cherry picked from commit ef053a42523ff2d57921837896b9ccc0a260cc27)

web: changelog

(cherry picked from commit 105c1d01429680a4e8a11a8c4be06f4ceca4329e)

web: changelog

(cherry picked from commit 3d42c123be7dd51be6586549f1f057052cc6fff9)
---
 hledger-lib/CHANGES           | 7 +++++++
 hledger-lib/hledger-lib.cabal | 4 +++-
 hledger-web/CHANGES           | 8 ++++++++
 hledger/CHANGES               | 9 +++++++--
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 hledger-lib/CHANGES

diff --git a/hledger-lib/CHANGES b/hledger-lib/CHANGES
new file mode 100644
index 000000000..f3a44056a
--- /dev/null
+++ b/hledger-lib/CHANGES
@@ -0,0 +1,7 @@
+0.22.2 (2014/4/16)
+
+- display years before 1000 with four digits, not three
+- avoid pretty-show to build with GHC < 7.4
+- allow text 1.1, drop data-pprint to build with GHC 7.8.x
+
+0.22.1 (2014/1/6) and older: see http://hledger.org/release-notes or doc/CHANGES.md.
diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index 9cc5c2c27..a237d9881 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -23,7 +23,9 @@ build-type:     Simple
 -- data-dir:       data
 -- data-files:
 -- extra-tmp-files:
-extra-source-files: tests/suite.hs
+extra-source-files: 
+                    tests/suite.hs
+                    CHANGES
 --   README
 --   sample.ledger
 --   sample.timelog
diff --git a/hledger-web/CHANGES b/hledger-web/CHANGES
index 7816213e6..9ffcc20b1 100644
--- a/hledger-web/CHANGES
+++ b/hledger-web/CHANGES
@@ -1,3 +1,11 @@
+0.22.7 (2014/4/17)
+
+- add Peter Simons' patch fixing Data.Conduit.Network HostIPv4 error (#171)
+
+0.22.6 (2014/4/16)
+
+- depend on hledger[-lib] 0.22.2
+
 0.22.5 (2014/4/15)
 
 - allow http-client 0.3.*, fixing cabal install again with GHC <= 7.6 (not yet 7.8)
diff --git a/hledger/CHANGES b/hledger/CHANGES
index 258be0201..58f42c2b5 100644
--- a/hledger/CHANGES
+++ b/hledger/CHANGES
@@ -56,6 +56,11 @@ Miscellaneous:
 - extra/hledger-rewrite.hs, adds postings to matched entries.
 
 
-0.22.1 (2014/1/6) and older
+0.22.2 (2014/4/16)
 
-See http://hledger.org/release-notes or doc/RELNOTES.md.
+- display years before 1000 with four digits, not three
+- avoid pretty-show to build with GHC < 7.4
+- allow text 1.1, drop data-pprint to build with GHC 7.8.x
+
+
+0.22.1 (2014/1/6) and older: see http://hledger.org/release-notes or doc/CHANGES.md.