Merge branch 'bug-1288' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:44:25 +0000 (14:44 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:44:25 +0000 (14:44 +0100)
commit34c3a6380c0e70b4648777b8b51e3a35117762df
treefab583fa763754c1046bd2ef46ad6a0039664241
parent203289a95a0f1b7db92729773babddf77b77495c
parent25936445de04c27c377f2de84f117100b43d533f
Merge branch 'bug-1288' into testserver-stable
includes/general.php