Merge pull request #265 from gabri94/for-15.05
authorBastian Bittorf <bb@npl.de>
Fri, 27 Jan 2017 09:26:14 +0000 (10:26 +0100)
committerGitHub <noreply@github.com>
Fri, 27 Jan 2017 09:26:14 +0000 (10:26 +0100)
commitc4d975fc18af8b1ab78566708a81323d5c7fda8f
treed26ab3d018937044b95813e1632e437a7b8f7e00
parent1975a41c2cc4ba0e612e7c617d9515b2f3e1e6b1
parent7737ef11efb4b6e35bfc27797924daf882ea85fc
Merge pull request #265 from gabri94/for-15.05

For 15.05