Merge branch 'bug-1097' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 01:59:02 +0000 (02:59 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 01:59:02 +0000 (02:59 +0100)
commit98c12d454741464082bfa11b746954b38dfac942
treeb5c1a523425f57402f9dfe4e43352f610408201a
parentd92573a703a521b92a5b64a16db72025b7882e32
parentc25bf27b661c9c303ad76d3e9789a794b25179ee
Merge branch 'bug-1097' into release