Merge branch 'bug-1393' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 20:20:53 +0000 (22:20 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 20:20:53 +0000 (22:20 +0200)
commitcf386f0fc750fb2d00303f88ee991e44b6ca910c
treedef927f0af4b9fd7b200d823ce598f95725f2bda
parent008a344ffb238e916db4556a4e9cadf689ab38fd
parentc044310fc5fdf268bc715ba9e12eaa634fbc58cc
Merge branch 'bug-1393' into testserver-stable
includes/general.php