Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 16:36:02 +0000 (18:36 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 16:36:02 +0000 (18:36 +0200)
commit52063341061ad1fa6907d055c769a3323c837032
treef05c7e949decae40d23db48f7daab411e9e29511
parent1ff927acee945d9e6a8289e0bea3836e38713f2a
parent0adfd095b66f6beb310ab1b95ecbe4ca8a15e9ab
Merge branch 'bug-1042' into testserver-stable
includes/lib/general.php