[SCM] gmusicbrowser/master: Merge commit 'upstream/1.1.7'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.1.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: db5b57d0c1f5d1d11456a9b63fa9dff9a47f46b9
X-Git-Newrev: f761eba15ccf48be5bb9f34b3790914e3bf4fdb8

The following commit has been merged in the master branch:
commit f761eba15ccf48be5bb9f34b3790914e3bf4fdb8
Merge: db5b57d0c1f5d1d11456a9b63fa9dff9a47f46b9 551d436ea62d306130a6f13d2fa89e4a33101a9c
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Mar 20 09:38:36 2011 +0100

    Merge commit 'upstream/1.1.7'
    
    Conflicts, fixed by hand:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/rules
    	debian/watch


-- 
gmusicbrowser packaging