upstream/2.2.9

Mathias Behrle

@mbehrle

be7f40a1 · Adding upstream version 2.2.9. · Jun 11, 2013

Tagging upstream version 2.2.9.