Merge branches 'bug-1050', 'bug-1052', 'bug-1054', 'bug-1055', 'bug-1058', 'bug-1059...
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:38:04 +0000 (20:38 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:38:04 +0000 (20:38 +0200)

Trivial merge