Merge branch 'bug-1094' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 18:00:20 +0000 (20:00 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 18:00:20 +0000 (20:00 +0200)
commit4527af1ecc920d65101fa3326eeabc3c1106ad31
tree8ba39d53ee5b68e72707cecbea00d638de0964b0
parentdb0e084bdced689e15246b97fdea7bd85e299bef
parent872521d6831db1e5796d9fac13212bbd3498865e
Merge branch 'bug-1094' into release