Merge branch 'bug-1392' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:50:05 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:50:05 +0000 (23:50 +0200)
commit48c5ae62272b7acdd9452267b82bae066dcb2052
tree37b3b083d236dee28fdab0c0666a4df083831b38
parentdcab312e776396123f9c4e2cca724fd681fcb42e
parent3c8261031957cc9418a9e185cdb70084653c936e
Merge branch 'bug-1392' into testserver-stable
includes/general.php