[SCM] gmerlin/master: New entry

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 148e759fe0bea8ff81217fb02b75e7489d00f5cc
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 31 07:25:36 2017 +0000

    New entry

diff --git a/debian/changelog b/debian/changelog
index 1477fcc..53fd04c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gmerlin (1.2.0~dfsg+1-6) unstable; urgency=medium
+
+  * Team upload
+
+  [ Felipe Sateler ]
+  * Disable esound plugin
+
+  [ Alessio Treglia ]
+  * Remove myself from the Uploaders field
+
+ -- Alessio Treglia <alessio at debian.org>  Tue, 31 Jan 2017 07:25:01 +0000
+
 gmerlin (1.2.0~dfsg+1-5) unstable; urgency=medium
 
   * Removed gmerlin-dbg

-- 
gmerlin packaging