[SCM] gmerlin/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/gmerlin

[alessio at users.alioth.debian.org]

Need to restore some more files to their pristine state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5b3465e607661a00905407f1b0cb86663421c018
X-Git-Newrev: be531e16321bbb440c5ef31f59dd50e0c7711396

The following commit has been merged in the master branch:
commit be531e16321bbb440c5ef31f59dd50e0c7711396
Merge: 7f50e4670275ea7fc2260ea8ba6e3a291bc3c20c 5b3465e607661a00905407f1b0cb86663421c018
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 16:15:18 2012 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/gmerlin


-- 
gmerlin packaging