Merge branch 'bug-1052' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 17:51:20 +0000 (19:51 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 17:51:20 +0000 (19:51 +0200)
commite74827482a4aae0629c252275745e46fcd735d71
tree5a80daf5878087e053a80b9f1e06cc0bf1689485
parent77ed5c5b06c2dc8fafc74c1be5a6197bb45e0f11
parent54d5789ba9a8c866a2543018b39fe21b4922542b
Merge branch 'bug-1052' into bug-1042