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

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

Imported Upstream version 0.12.2
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 e9590c612a1668061823e6d050d0ab45d9d2b379
Merge: e79a1a8e5874fd5e942c893a57663bb2f02e9af8 69a33c647e64af83022c35e89d7eaff03abcaf6a
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date:   Thu Jul 3 18:22:24 2014 +0200

    Merge tag 'upstream/0.12.2'
    
    Upstream version 0.12.2


-- 
mpd-sima packaging