Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:14:37 +0000 (12:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:14:37 +0000 (12:14 +0200)
commit47cf4981f142f529066177d94134d25e1bffb04d
treef461e1803ff23141ffbb2f2408f094eb06a16391
parentff3635d2030d026452b2d44a8f53d86c9fe96de4
parentc2df5bbf44cd2be87301b6d97190f3a8d883c7b2
Merge branch '2014.11' into 2014.11-develop