Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:24 +0000 (15:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:24 +0000 (15:39 +0100)
commit5f76731f4a140b3540313e51548c7467a5c89cd0
tree95c3e6b8b0314345336a07dd3f90763cd6a2cedb
parentc49493b2ad7be5545fd6a02955276f8937a3e350
parent61c5a53f2ec746902dddd37a9c254c3187d90a28
Merge branch '2015.11' into 2015.11-develop