Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Nov 2015 14:04:23 +0000 (15:04 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Nov 2015 14:04:23 +0000 (15:04 +0100)
commit60d53442a4a282ebdcaca20c9e697304a42fb6c9
tree0cef05969bec700a3e1ff5fa4a5020e09c59f282
parentc339dc6d109d0f063f98c00c70c637ee8e530d49
parent164189db4c888446452cd228411df3ccb2fb2083
Merge branch '2014.11-develop' into 2015.11