[SCM] gmerlin/master: Refresh changelog.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 169de6a47cd55dae282dd0c0243ffe1b1759662c
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 13:48:40 2012 +0200

    Refresh changelog.
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index 4432146..8fa68fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ gmerlin (1.2.0~dfsg-1) UNRELEASED; urgency=low
   * Drop function_param_type.patch, applied upstream.
   * Drop underlinking.patch, applied upstream.
   * Drop fix_ftbfs_gtk_2.24.patch, applied upstream.
+  * Update debian/copyright.
+  * Bump Standards.
 
  -- Alessio Treglia <alessio at debian.org>  Mon, 11 Jun 2012 13:22:11 +0200
 

-- 
gmerlin packaging