Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:55:51 +0000 (15:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:55:51 +0000 (15:55 +0100)
commit3a47ffac244dc0b251d68e99cf4000e418052b09
tree4b52f9d0b79b25e53f79148af388b060fe46e25e
parente0568a48358b61950c646f08cd0152d07c5c16ed
parenta1163c67df60530bb440b0a490b212c0d43b96f6
Merge branch '2014.11-develop' into 2015.11