Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:59:58 +0000 (14:59 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:59:58 +0000 (14:59 +0100)
commit814306e395e9f6039992d67c088854b8f0785996
treef5836dfa377ab182e164c19ebb08fc19ca5f172d
parent21315daeea94a80359698bb5143bab927ba7eaee
parent6288c98be0af18ece8d1ae674f65954452005b97
Merge branch 'bug-1318' into testserver-stable
includes/general.php