Merge branch 'bug-612' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 21:46:52 +0000 (23:46 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 21:46:52 +0000 (23:46 +0200)
commitc53755996f752bbf23c72c60446c52ee06c5c061
tree0d46666089cba20b8551dc47e8353c37173bf3c2
parent17c191d1ad8ff0f5388a4bccbdc40cf02e89a864
parent5a0a64af7c5f3d5e7069c419f384c2c4f71f91a1
Merge branch 'bug-612' into testserver-stable
includes/general.php