Merge branch 'bug-1047' into bug-1054 bug-1054
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)
commit6660a6b65da20ac75c08037ad9ab322fb4c1ce0f
tree53d279ff7a71694e8e732bda0109a673fe99ac03
parentf23d4c9e32949fec8ee6edd764b11ab7123cec8a
parent2efff443565132f9dc5bf31c72497189b68422ca
Merge branch 'bug-1047' into bug-1054