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)
1  2 
www/index.php

diff --cc www/index.php
Simple merge