Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:33 +0000 (17:53 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:53:33 +0000 (17:53 +0100)
commit03f91b804e699abd3682150b083bb944a2b4b0d5
treeebb10b80244c28d79cb9ac9bea288d40a4e45564
parent1f8e51e3f919b88533f760855596cf73ea586955
parent89259c809d6957720916aa0d6fb69aa8f87f28c4
Merge branch '2015.11-develop'