From f24abb60bdc9a2cf83185a0a7f8829cccf8ab5f7 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sat, 11 Jul 2015 07:37:36 +0200
Subject: [PATCH] New CHANGELOG

---
 CHANGELOG.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 48e947f4..2504c54f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,22 @@
+2015-05-09 23:07:36 +0200 Joe Hunt 
+Merge branch 'master' of ssh://git.code.sf.net/p/frontaccounting/git
+2015-05-09 23:06:09 +0200 Joe Hunt 
+New CHANGELOG.txt format.
+M	CHANGELOG.txt
+M	doc/CHANGELOG.old.txt
+
+2015-05-06 22:30:47 +0200 Janusz Dobrowolski 
+Fixed regression in db_pager.
+M	includes/db_pager.inc
+
+2015-04-13 19:03:26 +0200 Janusz Dobrowolski 
+Empty password is forbidden when creating new user account.
+M	admin/users.php
+
+2015-04-12 00:58:31 +0200 Janusz Dobrowolski 
+HTML cleanup in fiscal years selector helper.
+M	includes/ui/ui_lists.inc
+
 2015-04-29 16:39:48 +0200 Joe Hunt 
 Only first item in Supplier Credit Notes had tax added. Fixed.
 M	purchasing/supplier_credit.php
-- 
2.30.2