Merge branch 'bug-1184' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:50:38 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:50:38 +0000 (23:50 +0200)
commit0ea069195e48daced9e92cc919be59a483566c78
tree5f1eb2e1fbcd0f465a56cdf5613fded156e7081a
parentcf0497dcead22ffb3d341aca60a730c61931e9ef
parentea9f9d8d7f0b8f196161333384da2b814ac973fe
Merge branch 'bug-1184' into release
includes/general.php