Merge branch 'master' of https://github.com/medoc92/upmpdcli
Authored by: Jean-Francois Dockes 2016-11-03
Parent(s): [ad55eb][fe4cf5]
Child(ren): [3ae680]