Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 02:04:40 +0000 (03:04 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 02:04:40 +0000 (03:04 +0100)
commitfe18b916965427af18bc80f6f02886257f1599bf
treef80837d53b69dc96b8691100f1a67e831c2b1353
parente59d438b2b860b8c1a88fba7f6309301d7fe2072
parent3324a701310a6fa2f12b6652ed2d6646a00abc99
Merge branch 'bug-1354' into testserver-stable