Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Mar 2015 17:09:33 +0000 (18:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Mar 2015 17:09:33 +0000 (18:09 +0100)
commit6f4d7557af4dc26341b0262f8bd2ed19a1697998
tree2e61745662beba385bce5979d6e3a6e6c9cff63b
parent578a08aa57c799349c66623054eda9d099ec3c10
parent1b857e361e44eee5566bfb276a32ac9334af9dbf
Merge branch '2014.11' into 2014.11-develop