Merge branch 'bug-1047' into bug-1050
authorFelix Dörre <felix@dogcraft.de>
Tue, 21 Apr 2015 20:10:45 +0000 (22:10 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 21 Apr 2015 20:10:45 +0000 (22:10 +0200)
commit789164b7fe19751b597c1b41c52e9691e1587d5e
tree1c57fcecd0f43bb474220e9013cad98f5fade34d
parentc8ab3e8010d33158f127fe0c6a89966f9395898a
parent16cb7044fa31e618f969d6104d976a7bc087e1be
Merge branch 'bug-1047' into bug-1050