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

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

Imported Upstream version 0.12.1
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 32e0eb4a7c44f8c44bcfb252f917c1bf812d442f
Merge: 53e532e4b1e5efbafc95a7f850b87f200ed5e01a 89e471581670227bde8b73308e6874ed9fc09c3a
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date:   Sat Jun 21 14:23:25 2014 +0200

    Merge tag 'upstream/0.12.1'
    
    Upstream version 0.12.1


-- 
mpd-sima packaging