Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 14:08:22 +0000 (15:08 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 14:08:22 +0000 (15:08 +0100)
commitbdf526bffe8c3bc441b9d3b8c02e3e209457321a
tree23a57923e761b6d0d15f92ced54fd5bd61323a67
parent814306e395e9f6039992d67c088854b8f0785996
parent292ac178bf2ac32834fafc3313fa294dbeae8ecb
Merge branch 'bug-1318' into testserver-stable
includes/general.php