Merge branch 'bug-918' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:36:31 +0000 (22:36 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:36:31 +0000 (22:36 +0200)
commit8947e9bec9c0b39a62fb852f3e87702cfadb9211
tree48f6f03470353d5f4f33bff9f7ffc10e02c570d4
parent02f5da9c7ed1c6882320f64b5da753841be7ad70
parentc190302739d470d6c8fd43d93b5fad776323d467
Merge branch 'bug-918' into release