Merge branch 'bug-1070' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 1 Apr 2014 08:27:58 +0000 (10:27 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 1 Apr 2014 08:27:58 +0000 (10:27 +0200)
commit7edae081657bd29b34caa998e4fbfddf7be3ea8d
treec00a988814183164988d3f1f4d47f750ea17a59b
parent0d791f450e65657cfd615471cf31dfc0ba5d9b37
parent7dc9f2b4fbc39bb5cfb1f6b1428f2824a621fa05
Merge branch 'bug-1070' into release
includes/general.php