Merge branch 'bug-1343' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 13 Dec 2014 19:33:18 +0000 (20:33 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 13 Dec 2014 19:33:18 +0000 (20:33 +0100)
commitee87b9734f5925dff68780c8e8ae65cfb79d57f8
treee38a08e877e217687348c7c9e618cea68658b552
parent5ddd497f2cd0af7a8fcecf5e0ed462fcbed8e302
parentfeea340cb19b979ae796a27fa749da037ac50bd9
Merge branch 'bug-1343' into testserver-stable