Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 15:15:50 +0000 (16:15 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 15:15:50 +0000 (16:15 +0100)
commit0267223199c2dac653216eee63cd9a95048551e8
tree30d797fab7c0ea5563dbbe922bd3959314125fff
parent8e38a22d467d56a29d20ad0b75c4442cd9268134
parent88de5d85640962e8b0b0df14bcc5801a8858ffd4
Merge branch 'bug-1354' into testserver-stable
includes/general.php