Merge branch 'bug-1223' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 28 Oct 2014 20:56:32 +0000 (21:56 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 28 Oct 2014 20:56:32 +0000 (21:56 +0100)
commit8190047643b449c3ce6f85516aec73f9da3a9468
tree4e9784d2520538313d7ddbaf7ca563404346ebc6
parent0ffc97cbe1e0c4796022ea69f7dbbb1a8f02336b
parent73cee03f65100c4b300c9c005b6de9730e1adcee
Merge branch 'bug-1223' into testserver-stable
www/index.php