Merge branch 'bug-1341' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 20:11:41 +0000 (21:11 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 20:11:41 +0000 (21:11 +0100)
commit4818f12e8c7e6627b09e3cdadb96ef327ad6f9c4
tree3f8df38dc806b24b16333f7623e38e92f141102e
parent21a7023d57d54c2245a51814c91391abf0790b39
parent85b24e6a28ed5cf2534a7d5a6039d5560c7f3dbf
Merge branch 'bug-1341' into release