Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Apr 2013 18:25:27 +0000 (20:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Apr 2013 18:25:27 +0000 (20:25 +0200)
commit7e865a58256ecc84121c4824a63eb7eac62eafe1
tree78e1aa5a887b1b49f4c7dabee96ff7db378c0f2f
parent3fe911050775f6ff3a55233a3cc43c0b41a94e84
parent13d7627ab5b4e4d0ffd02ba81ea6cda224d7d2ef
Merge branch 'pu/2013.03/modelconfig-hr'