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

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

Imported Upstream version 0.12.3
Imported Upstream version 0.12.2
Imported Upstream version 0.12.1
Imported Upstream version 0.12.0
Imported Upstream version 0.12.0~3~325e87e
Imported Upstream version 0.12.0~2~7bd1cf9
Imported Upstream version 0.12.0~4ae3d6a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2d3ae7f1cb794c76fd4800b5c8eea96c304241b7
X-Git-Newrev: a32472e385de0b3c2885409af76a5177a5e3c5cd

The following commit has been merged in the master branch:
commit 154cd6289872eaa2e65f52ec7b4129b6f7fcc68e
Merge: 2d3ae7f1cb794c76fd4800b5c8eea96c304241b7 0113b0172dd4c9f46a08d50a5d7fe006608909ff
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date:   Sat Dec 6 17:51:22 2014 +0100

    Merge tag 'upstream/0.12.3'
    
    Upstream version 0.12.3
    
    Conflicts:
    	data/man/album.cfg
    	data/man/info.xml
    	data/man/mpd-sima.1
    	data/man/mpd_sima.cfg.5
    	data/man/simadb_cli.1
    	doc/Changelog
    	sima/info.py
    	sima/lib/track.py
    	sima/lib/webserv.py


-- 
mpd-sima packaging