Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:19:23 +0000 (18:19 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:19:23 +0000 (18:19 +0200)
commitf2993a6de1827a9283803afb560c265aff3c3b7f
treec3093e98241f70e13024ded8931f919980d08a90
parent83deaf9ba27d98ad4169e5a6d301e0c275d0d05a
parentbeec12a9f043fe6ebb8ab9869b42a77f4aa5a0e9
Merge branch '2014.09' into 2015.07