Merge branch 'pu/2013.10-groupimport'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Sep 2014 10:07:54 +0000 (12:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Sep 2014 10:07:54 +0000 (12:07 +0200)

Trivial merge