Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 16 Mar 2015 16:25:53 +0000 (17:25 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 16 Mar 2015 16:25:53 +0000 (17:25 +0100)
commit5f64094d804b0305dc7882c819b27fee10ef2877
tree5b6d09036007a9e4f19c7a4b3a0bd76cf11f4bf0
parentfaf5406cb094c29bb2756e1b7a8c54f894fc1e50
parent254d1932ad648f7f5b10616bcdb777b838c79660
Merge branch '2014.11-develop' into 2014.09