Merge branch 'bug-1355' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 23:27:55 +0000 (00:27 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 23:27:55 +0000 (00:27 +0100)
commitc7ffefb15377a7471dd34506f7fa6a08a20d1b3b
treeda76ea19148554804abd9e321ed91ac4d0a1c297
parent2b41c2bbfa49fbcca2977e50d5257f984b23425f
parentaaa1fc652bb0be525059ba5ed5cfc8f1bac8f3b0
Merge branch 'bug-1355' into testserver-stable