Merge branch 'bug-1047' into bug-1059 bug-1059
authorFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:26 +0000 (20:32 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:26 +0000 (20:32 +0200)
commit14f10d84918c3e581ec50d8f93b06e89f75ff42a
treeae9aa411498cdaac3f55e1521ace3a52167838ea
parent17cd1e7fb941f8f0180b457d3791718e47cabf80
parent2efff443565132f9dc5bf31c72497189b68422ca
Merge branch 'bug-1047' into bug-1059