Merge branch 'bug-1047' into bug-1060 bug-1060
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)
commita699cc0a43203ac5c81a1732ada3cda8b09e5350
tree25f8372a5310d0590c93268db72060ec1235b1d9
parent8e447dced0b5906a132d74870539fc639d3cc202
parent2efff443565132f9dc5bf31c72497189b68422ca
Merge branch 'bug-1047' into bug-1060