Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 6 Jan 2015 11:27:11 +0000 (12:27 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 6 Jan 2015 11:27:11 +0000 (12:27 +0100)
commiteded2a862acb1705211de7ef21ceba91c0a1614a
tree6fafd1efa26fc3092c1c552041dcd22ff3bee300
parent52e7148010c24acbeaabcde9872ae41ae9637221
parentcbe00a78456591fc1144340835ab074820016dac
Merge branch '2013.10' into 2014.11