Merge branch 'bug-1341' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 20:15:12 +0000 (21:15 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 11 Mar 2015 20:15:12 +0000 (21:15 +0100)
1  2 
www/index.php

diff --cc www/index.php
Simple merge