conftree: astyle + merge with upmpdcli version
Authored by: Jean-Francois Dockes 2016-02-22
Parent(s): [d1f16a]
Child(ren): [08a810]