Merge branch 'bug-1130' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 00:46:18 +0000 (01:46 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 00:46:18 +0000 (01:46 +0100)
commitd92573a703a521b92a5b64a16db72025b7882e32
treeafaed46a93704d137f0b88ab16129ccc4adb291a
parent22073b28d1889c0991ec09c03c0167876a812df5
parent5a03eb2d1b5e57194002d41c0be1d780bafccea7
Merge branch 'bug-1130' into release