Merge branch 'bug-740' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:53:59 +0000 (19:53 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:53:59 +0000 (19:53 +0200)
commitd667474cb21d5258524d8a1f8f36e61df6c5af0b
tree69615c0ce0eeed5c7d98c1b52f6a01d324e0d0ab
parent237698fa4180bb3fdfa74469f690537df8bd422f
parentdf0ba3f3626c222748fe9efb592111a3fd594f4d
Merge branch 'bug-740' into release