Merge branch 'bug-1050' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:10 +0000 (22:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:10 +0000 (22:50 +0200)
commitcdf3dc9fb536596c55470a6541b6f393686a35fa
treeebb6e329cf99886c34d01ecd2e8c52635e29c7c0
parentf2bae896ea51449e491c4589c1a7702e8b8395d3
parenta17af2d6b7f9bd5d37e9c48518aad9a14ac256ca
Merge branch 'bug-1050' into bug-1042