Merge branch 'bug-1034' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 02:38:31 +0000 (03:38 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 02:38:31 +0000 (03:38 +0100)
commit446c34643ac17f8677066cea2e87975382c242e5
tree04d5a10f62d43ca9c90e282da51832c1dcaf8c27
parent98c12d454741464082bfa11b746954b38dfac942
parentaa787cb563b6a8ca532dabc503e471f09fcae029
Merge branch 'bug-1034' into release