Merge branch 'release/3.1.2' 3.1.2
authorAlex Kellner <alexander.kellner@in2code.de>
Sun, 21 Feb 2016 18:45:11 +0000 (19:45 +0100)
committerAlex Kellner <alexander.kellner@in2code.de>
Sun, 21 Feb 2016 18:45:11 +0000 (19:45 +0100)
commit2e75eabbcb1370b07a6026e8456900c27f30e8ea
tree7976ed5c9fbd612bcb82620f308e4b0e34981b4d
parent6a7f1bc6e12417e738e3065c837392205d2b7c50
parent0b032d89a2928d8fb2b62cd67ca9027986fc60a5
Merge branch 'release/3.1.2'