Merge branch 'bug-1047' into bug-1058
authorFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:25 +0000 (20:32 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 5 May 2015 18:32:25 +0000 (20:32 +0200)
commit42b16725e1143d770ff3426a4a74788fd334a6ec
tree572aa772d0bab933842f484f233601ef09be83c2
parentf2a909d694c7039d6a405e71674f325e2ddffc3e
parent2efff443565132f9dc5bf31c72497189b68422ca
Merge branch 'bug-1047' into bug-1058