[SCM] gmusicbrowser/master: Merge branch 'upstream'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.1.13~ds0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bd7df69c5416d4523d90a604f98b7767865ed03c
X-Git-Newrev: 2ed77c5fcb6edff4bc444f7a88c2cd2907014834

The following commit has been merged in the master branch:
commit ce943c9ac238a410a815c9ebd343b50e6c9ff552
Merge: bd7df69c5416d4523d90a604f98b7767865ed03c b2309e7354fb0636c5893dc996f3f7f3e0f56a1c
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Sep 11 12:17:56 2014 +0100

    Merge branch 'upstream'


-- 
gmusicbrowser packaging