Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 15:46:15 +0000 (16:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 15:46:15 +0000 (16:46 +0100)
commite9fdba711dd84b7b10f3a350c7380ee65b938ffc
treedef45ef3946954ea139b04e7fd60339387f8143d
parentd8acba9cb4caef9fac243278547cfd11558f1b63
parent94c30ed39effd34daa266292fe5b4ac4ec1071ad
Merge branch '2015.11-develop'