Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:47:16 +0000 (16:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:47:16 +0000 (16:47 +0200)
commitd90d719fac18011252b79abf04a6e70b9fb806b5
tree73d218d14ce661cd8f0d1f1176dc775a5b14c24e
parent3171066b3f1e0ce54fbd011dfb9e553944112d9e
parent790c95c5dee8c6411f4b4f852590b106b30d68eb
Merge branch '2013.10' into 2014.11