Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:45:00 +0000 (12:45 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:45:00 +0000 (12:45 +0100)
commit7c3895e93b19ba6bace1689fce337214c808e95e
treeea869fec63e9490dff98589f3fc10dd46e6cc544
parent08885672664b591957b8644a33806a805e440e35
parent21fe27f417436e988e806a48f5ea36f877a11971
Merge branch '2014.11' into 2014.11-develop