Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:40:33 +0000 (08:40 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:40:33 +0000 (08:40 +0200)
commitfc7a085b29e36dccd3e891f693693679b5cdc801
treea023c02c108f2eee73d8bfa7618420eff5ca2112
parent733814fd08a122cf076887602894bf80175f5687
parent7239b831f830eb8f3f40603e3beb7d78d952496c
Merge branch 'bug-1391'