Merge branch 'bug-1047' into bug-1055 bug-1055
authorFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:24 +0000 (20:32 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:24 +0000 (20:32 +0200)
commitade842bd3152420edc94d2509c239557db5ec215
treef68efed08b69fd831cd1b8c16a4999610a0f9f90
parent555aa9b8cdbf7473b9874c18e0cb3b530c9781fb
parent2efff443565132f9dc5bf31c72497189b68422ca
Merge branch 'bug-1047' into bug-1055