Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 24 Jul 2015 10:09:06 +0000 (12:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 24 Jul 2015 10:09:06 +0000 (12:09 +0200)
commit5e8dccff6b337dc48c2b0e9ad45abe8716a27d76
treeb1f961fe7d3c52e9fbc4117915a695d862f0fa58
parentae0465daa65aa1ed043d2f5f3ba35ae7bc14998f
parenta711b8c1cd99b602a6a5ddfaab011dc86a4a10fd
Merge branch '2014.11-develop' into 2015.07