Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 May 2013 16:40:00 +0000 (18:40 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 May 2013 16:40:00 +0000 (18:40 +0200)
commit1e4ebd415cc59abacc2f8e8ecb7cb55f02ecbe8f
treeb2afecbf29914a170680f3123420070da3474e7a
parentdee564c0120e10c57eff0af30c0e75118c19b598
parent00916a814b33e65e1b9e9143dfd341f7f59a1235
Merge branch 'pu/2013.03/modelconfig-hr'
tine20/Voipmanager/Controller/Snom/Phone.php