Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:18:35 +0000 (18:18 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:18:35 +0000 (18:18 +0200)
commit83deaf9ba27d98ad4169e5a6d301e0c275d0d05a
tree91897717854216dcaba85c9e77956dac1b95e7fe
parenta2af6f970ac62ce253040cadeb03881062fca85f
parent470f560a8dd7a9926d0500cef3366c31c07c6a76
Merge branch '2014.11-develop' into 2015.07