Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Nov 2015 11:46:38 +0000 (12:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Nov 2015 11:46:38 +0000 (12:46 +0100)
commit9dbfd3d0df3c21fdeab645293cbd2dcab0bd7191
treee47800cc30cc7cbf6ebe109d185a4cc38493c54b
parente9d53aab5293503a40e484a78d026480c7b2a966
parentd433b216dc218f8eb28dedf10aea62e5d165b769
Merge branch '2014.11' into 2014.11-develop