Merge branch 'pu/2013.03-modelconfig-hr/inventory'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Jun 2013 14:32:21 +0000 (16:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Jun 2013 14:32:21 +0000 (16:32 +0200)
commit6672ded4a9b6d1b7556d627314f225986defb5ed
treeb930af2adea56cb0a24d88d28bdea674eb0d91f5
parent23844e3fa8bbfb27a3ff85b6782c3292cb9826e6
parent392432c5614a84169eeeb7f6f42bd51571abc599
Merge branch 'pu/2013.03-modelconfig-hr/inventory'