Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 12 Sep 2016 12:24:05 +0000 (14:24 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 12 Sep 2016 12:24:05 +0000 (14:24 +0200)
1  2 
tine20/build.xml
tine20/langHelper.php

Simple merge
Simple merge