Merge branch 'bug-1050' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:21:25 +0000 (23:21 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:21:25 +0000 (23:21 +0200)
commitb9d8afd498aa01de66c84845edadd22d43934a14
tree793d1f7f49e0af17738af2d9760550722010ec78
parentcdf3dc9fb536596c55470a6541b6f393686a35fa
parent3abe7dcec217fd183e042e66e4356738af019e41
Merge branch 'bug-1050' into bug-1042