Merge branch 'bug-1301' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Fri, 29 Aug 2014 22:54:28 +0000 (00:54 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 29 Aug 2014 22:54:28 +0000 (00:54 +0200)
commit192c3cd186369b5e6e5fe3bd37f6aebf2b49a162
treeba4c613558ca5331478fabc6f5a3fd9fc8cd1891
parent38cd04036a00f1e115966991f6f99e1a58217b99
parentea4fe47d7f3fb6926bae6d360c9d61e805999e00
Merge branch 'bug-1301' into testserver-stable
includes/general.php