Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Aug 2016 12:03:52 +0000 (14:03 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Aug 2016 12:03:52 +0000 (14:03 +0200)
commit5616929bab60d57725a7f6e20426402406afeed7
treec5c4d4db5b2519afd2a7331044812b1c2f18cedb
parente6364e8974bd9d26d5bb89c983284ff734ba585a
parent56cec37bbf05bb1aefffa23977403cf973106411
Merge branch '2015.11-develop' into 2016.03