Merge branch 'bug-1069' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 00:23:32 +0000 (01:23 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Jan 2013 00:23:32 +0000 (01:23 +0100)
commit880419370b729ba61dbcfc7ef187d20607dccf0f
tree5d08d081973bf929bf3f0f9f057bb43b5f61157d
parent05f008892d127f3e80a3e43384478e29d142ea9a
parent4a32ecfb7b66b051d3e295683d0b2191fbbe1aa8
Merge branch 'bug-1069' into release