Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Apr 2016 07:43:03 +0000 (09:43 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Apr 2016 07:43:03 +0000 (09:43 +0200)
commit91ac00ecb216da8ea968e17d0deabf188eeb6e60
tree3c5ac90b15219d24a210bd37c9f086a3d9bd4aed
parenta62c3b3a32128f396dfa006866dede9847852b69
parent8eecd0e0cc59eed4ec83d26122d56cde0196ab2b
Merge branch '2015.11-develop' into 2016.03