[SCM] gmerlin/master: Merge multiple entries from the same author

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e954c0e5591d1474358024a457ba3b8343377133
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jan 16 13:43:58 2011 +0100

    Merge multiple entries from the same author

diff --git a/debian/changelog b/debian/changelog
index 0d399c8..69854ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,13 +6,9 @@ gmerlin (1.0.0~dfsg-1) UNRELEASED; urgency=low
   * updated to new upstream
   * fix_577328.patch is no longer needed (fixed in upstream)
   * debian/source: 3.0 (quilt)
-
-  [ IOhannes m zmölnig ]
   * let CDBS handle get-orig-source
   * Imported Upstream version 1.0.0~dfsg
   * provide a debian policy compliant bg_sem.h
-
-  [ IOhannes m zmölnig ]
   * Add git-buildpackage configfile, enabling pristine-tar and signed
     tags.
   * remove (accidental) double call to (deprecated) png_set_gray...()
@@ -21,31 +17,21 @@ gmerlin (1.0.0~dfsg-1) UNRELEASED; urgency=low
   * fix various typos reported by lintian
   * fixed typo in manpage
   * fix short descriptions for packages
-
-  [ IOhannes m zmölnig ]
   * remove (accidental) double call to (deprecated) png_set_gray...()
   * Bumped standards to 3.9.1
   * exclude CVS directories when repackaging source
-
-  [ IOhannes m zmölnig ]
   * link against libxml/libm when needed
   * more consistent .desktop files (remove .png suffix)
   * link app-icons to default place
-
-  [ IOhannes m zmölnig ]
   * move images from libgmerlin-doc to gmerlin-doc
   * adding manpages
   * put internal binaries into /usr/lib/gmerlin
-
-  [ IOhannes m zmölnig ]
   * debian/rules: added copyright notice
   * include cdbs/utils.mk for copyright checks
   * re-created debian/copyright (with the help of licensecheck)
   * ignore binaries from licensecheck
   * generate debian/copyright_hints
   * remove generated manpages on "clean"
-
-  [ IOhannes m zmölnig ]
   * fix path when generating manpages
   * patch to prevent segfault when there is no plugin
   * store/restore autogenerated files
@@ -54,8 +40,6 @@ gmerlin (1.0.0~dfsg-1) UNRELEASED; urgency=low
   * gmerlin.info is generated (no need for patching)
   * regenerated debian/copyright_newhints
   * fixed long description
-
-  [ IOhannes m zmölnig ]
   * Suggest: gmerlin-encoders
   * added plugin.sym to libgmerlin0
   * removed trailing whitespaces

-- 
gmerlin packaging