[SCM] gmerlin/master: ready for release

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ef5b4d11d359f29ec843bb9a0b98e787ff5fdb9a
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Jul 31 17:46:03 2014 +0200

    ready for release

diff --git a/debian/changelog b/debian/changelog
index cfb1721..506053b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmerlin (1.2.0~dfsg+1-3) unstable; urgency=medium
+
+  * Fixed function definition (Closes: #748164)
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Thu, 31 Jul 2014 17:45:51 +0200
+
 gmerlin (1.2.0~dfsg+1-2) unstable; urgency=medium
 
   [ Jonas Smedegaard ]

-- 
gmerlin packaging