Merge branch '2015.11'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Nov 2015 08:50:01 +0000 (09:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Nov 2015 08:50:01 +0000 (09:50 +0100)
commit7229bc1fb5767bfb6186a79341862cbdf3722d70
tree2c5d22d29e27df91b9d5ad2584a1ee13733ac456
parent831c49d4e6546c26de783795d0cbe83f1433ae4b
parentc339dc6d109d0f063f98c00c70c637ee8e530d49
Merge branch '2015.11'