Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 14:20:43 +0000 (15:20 +0100)
committerBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 14:20:43 +0000 (15:20 +0100)
commitb5a28349bc1b1478f879e403e398a92d1adbf2fb
treedcb8054e9e12dd93b35ac92973a903f11e4ecb8e
parentac92de8388b4c038981252bc23b06ca1ebdfb319
parentae1040f52ee32e3ccab718722f705db1703b51c0
Merge branch 'bug-1354' into testserver-stable
includes/general.php