Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Oct 2015 12:54:06 +0000 (14:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Oct 2015 12:54:06 +0000 (14:54 +0200)
commit092aa010d5020ef6579cb48072cb74d06fc5704a
tree4a2f467db6d3b099fa099fb170465b91691b2ab0
parent650d2f4a7ccdd080b867b6a712fbe96589e8978d
parentdcc8b918a4b9616bcf107fe3697ff6c4f27403c5
Merge branch '2014.11-develop' into 2015.07