Merge branch 'bug-1199' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:34:53 +0000 (22:34 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:34:53 +0000 (22:34 +0200)
commit02f5da9c7ed1c6882320f64b5da753841be7ad70
tree79c9659794ef4fdd426250f5ce19b80def089803
parent027e4712332f850848104e93ad9c955a328138c7
parentdd16a1106e8652a7698e6eedbc0a7134ad493d4e
Merge branch 'bug-1199' into release