Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 18:54:47 +0000 (20:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 18:54:47 +0000 (20:54 +0200)
commit3ecb51909849399ab13f82dcbb0091cb8638870e
treed3023937aad4935203770a540d76851477a8faf0
parentd41eb3b40ce960e7a4607f95e6d2e4ccb6e7f954
parent8b9b2de72db4c353d2d5bc80fa1e82ff9112e15b
Merge branch '2014.11-develop' into 2014.09