[SCM] mpd-sima/master: Merge tag 'upstream/0.12.0_68ccd3f'

[kaliko-guest at users.alioth.debian.org]

Imported Upstream version 0.12.0~68ccd3f
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 88ec0c9a3c72f6ba7114497af9df0d2bc0d1f216
X-Git-Newrev: 62e2cbd59f0e8af9b521fb54f6e2c0b381aa29ea

The following commit has been merged in the master branch:
commit 4246550c08ac227f208428a6140acc672a2da0e5
Merge: 5226aee2ca26ec47edcc090334b750e51a3332bd 5a49d295da713f07b280582514090a250458c220
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date:   Sun Feb 2 20:02:25 2014 +0100

    Merge tag 'upstream/0.12.0_68ccd3f'
    
    Upstream version 0.12.0~68ccd3f


-- 
mpd-sima packaging