Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 12:16:37 +0000 (14:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 12:16:37 +0000 (14:16 +0200)

Trivial merge