Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Feb 2015 16:30:50 +0000 (17:30 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Feb 2015 16:30:50 +0000 (17:30 +0100)
commita9a4afb6e5e43aea61e0076ea61f1078f1ef392f
treecaa63e337f0bc94cfd791a5e47ab51cd31f340a6
parent4cdb2bc7d94cbe6661bff4e69354552f4f072d97
parent435071be649e9bb81a9581abfc309edaac0178c6
Merge branch '2013.10' into 2014.11