[SCM] gmerlin/master: Ready for upload

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bd381cf734f44b5799ed0959bf56bd1ea284bfa1
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Sep 15 12:48:50 2014 +0200

    Ready for upload

diff --git a/debian/changelog b/debian/changelog
index 506053b..a8af6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gmerlin (1.2.0~dfsg+1-4) unstable; urgency=medium
+
+  * Made 'gmerlin' depend on 'gmerlin-plugins-base' (Closes: 672352)
+  * Updated debian/copyright_hints
+  * Regenerated debian/control
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Mon, 15 Sep 2014 12:48:28 +0200
+
 gmerlin (1.2.0~dfsg+1-3) unstable; urgency=medium
 
   * Fixed function definition (Closes: #748164)

-- 
gmerlin packaging