Merge branch 'bug-1043' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 6 Jan 2015 21:26:12 +0000 (22:26 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 6 Jan 2015 21:26:12 +0000 (22:26 +0100)
commit14aa05a79dbc77f5dd7aadf600afd095c0605ef2
tree1ed53b6895ce97485076860a8267496863a0940f
parent03bcce1f880ad647780d00be9eeaadd2fd66d1dc
parentac09619a1e8debbd61be910f2446a19430f5e7ce
Merge branch 'bug-1043' into testserver-stable
includes/general.php