Merge branch 'bug-1341' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 22:31:09 +0000 (23:31 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 22:31:09 +0000 (23:31 +0100)
commit345eb2e771f6475e243f406fe37c41933a520c11
tree119a6cdc24cbd390063ef80aa164c3906488f6ae
parent4818f12e8c7e6627b09e3cdadb96ef327ad6f9c4
parent0e14ede2f690be0df938ef2e98b974f60882612f
Merge branch 'bug-1341' into release