Merge branch 'bug-1304' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 19:27:31 +0000 (21:27 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 19:27:31 +0000 (21:27 +0200)
commit3be9fa53a016c6119e7a57b94d0388384c4ac39d
tree615569d56541cf6ddb499e928df25eec03fbe806
parent85c46974167b86a04a4bffd5437d3d313539d6bb
parent1ae24983dffe38ecc85e022a22d85cf1ff9775cd
Merge branch 'bug-1304' into testserver-stable