[SCM] jkmeter/master: Update changelog

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0dacc0d640883e8cb593225cc0416ff75c2c0283
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Jul 31 13:16:44 2011 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index fcd1b25..aa0d120 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+jkmeter (0.4.0-4) UNRELEASED; urgency=low
+
+  [Alessio Treglia]
+  * Add DM-Upload-Allowed.
+  * Update debian/watch file.
+  * Bump Standards.
+  * Fix Homepage field (Closes: #629378).
+  * Fix gbp.config file.
+
+  [Jaromír Mikeš]
+  * Added local-option file
+  * Fix FTBFS with libpng 1.5
+   - thanks to Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+  * Added menu file
+
+ -- Jaromír Mikeš <mira.mikes at seznam.cz>  Sun, 31 Jul 2011 12:27:40 +0200
+
 jkmeter (0.4.0-3) unstable; urgency=low
 
   * Pass -pthread flag to the linker to fix FTBFS with binutils-gold.

-- 
jkmeter packaging