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

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

Imported Upstream version 0.12.0~2~7bd1cf9
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 00c2f298c9283df6926e7928166854f518fb569d
Merge: 4439483aafc1023e46ddec4004baf2caf94fbe18 b349e8d5169f429fd36b6dbb34f58c574a544723
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date:   Thu Jun 12 14:48:47 2014 +0200

    Merge tag 'upstream/0.12.0_2_7bd1cf9'
    
    Upstream version 0.12.0~2~7bd1cf9


-- 
mpd-sima packaging