Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 6 Aug 2013 08:17:00 +0000 (10:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 6 Aug 2013 08:17:00 +0000 (10:17 +0200)

Trivial merge