Merge branch 'bug-1091' into release
authorBenny Baumann <BenBE@geshi.org>
Thu, 11 Oct 2012 11:34:39 +0000 (13:34 +0200)
committerBenny Baumann <BenBE@geshi.org>
Thu, 11 Oct 2012 11:34:39 +0000 (13:34 +0200)
commit8dbf200f93d34e024351438721bd8d23d04e114e
treef65cd3d418d2dbdad29b920b5ce6805491ffd311
parent7400caae53a400dcc1e9fab13610fe29cfd6c0a8
parent947aa18ca593a2b466cfc5d31ad97a9a437dccca
Merge branch 'bug-1091' into release