Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Tue, 28 Jul 2015 20:37:58 +0000 (22:37 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 28 Jul 2015 20:37:58 +0000 (22:37 +0200)
commitdae1d5c7f82c985715e7e6aee9e6355efe560247
tree8d92cd3d6fb7a85465f47deb5519f972a16f7c1b
parent5a7e58532094a15203a35765f56ebd002a62a005
parent1c5bceeae7f572a975ed7c2c17fa4cffce4718a6
Merge branch 'bug-1391'