Merge branch 'bug-888' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jan 2013 23:14:47 +0000 (00:14 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jan 2013 23:14:47 +0000 (00:14 +0100)
commit05f008892d127f3e80a3e43384478e29d142ea9a
tree477f6128c0a82ef3f91e77180da08d502ba678c8
parent3441e9895738e27a95518680209c41641eff7df0
parenta53a87fdb6624bcfece257f861f49a883ed24d2c
Merge branch 'bug-888' into release