Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:16:53 +0000 (20:16 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:16:53 +0000 (20:16 +0200)
commit7728aa131769af4a73b6779e0d25220d23a0b3d9
tree43ad4bda377d003f80ba2bc9bcdd6c2e155b9fac
parent6cc7ca38ba1bb93c3ac47a67c31fc113c98ea0f1
parentb69a57b13e92d188ee659ca733b060e374f39918
Merge branch 'bug-1042' into testserver-stable
includes/general.php