Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:16 +0000 (17:53 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:16 +0000 (17:53 +0100)
commit27eba077e1fc644272d4432c56db5cf1b1bbb024
treee04cf29f7129f5203e3f256f836193cb2444248f
parent4b5d58fd62e284499567645122a645daf0bb4f1e
parentcdbcafbf64d0c05e0a7b89e84e02916231d61d26
Merge branch '2014.11-develop' into 2015.11