Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 16:32:47 +0000 (18:32 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 16:32:47 +0000 (18:32 +0200)
commit1ff927acee945d9e6a8289e0bea3836e38713f2a
tree3a5621e68cdd708b1c8029ca093a9edd32278e1b
parent448b50cdd201b7924c8c1c162f141c9294966a6d
parent99265c86b550e591f43cd31420cf7e138060aaa2
Merge branch 'bug-1042' into testserver-stable
includes/lib/general.php