Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:27:33 +0000 (14:27 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:27:33 +0000 (14:27 +0100)
commit203289a95a0f1b7db92729773babddf77b77495c
treea273155271c7a0ddf9035730f4cb0ddfd8912748
parent00c7fb36da60ebc174e915837c8150014c537cba
parent285cd754385216cec4292ce74f75f945d267c78d
Merge branch 'bug-1318' into testserver-stable
includes/general.php