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)
commite27ff6b7e868d6149a95d2015f66bfe8af158155
treeb2afecbf29914a170680f3123420070da3474e7a
parent00817d4f4368b99fcf401f4a3ea2975d4b14aff6
parent657d980353d803dabccc7aed9000b7a55bbf34c6
Merge branch 'pu/2013.03/modelconfig-hr'
tine20/Voipmanager/Controller/Snom/Phone.php