Merge branch 'bug-1308' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 21:20:43 +0000 (23:20 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 21:20:43 +0000 (23:20 +0200)
commitd1f414b231573e9154fd399556f46cf80bb4bfce
tree618ca5986bf185c3fd13aa6b06abb9eec7744e7d
parent7a4bc4f99bcdfaafe4d6f509f4e56921b61c8040
parent107e96eda7a5085d2fd016c72dbf4c676d1ad835
Merge branch 'bug-1308' into testserver-stable
includes/general.php