Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:39:00 +0000 (11:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:39:00 +0000 (11:39 +0100)
commit8caf24aa760d08e266ed195dcf0ef30a9f0b6520
tree40f16466ac75936ccc6e3e1d7b7c1310ddde8b2c
parent03f91b804e699abd3682150b083bb944a2b4b0d5
parent78bc47ec4705fa97038fced9264c9b0dd4337ef8
Merge branch '2015.11-develop'