upstream/2.6.1

Mathias Behrle

@mbehrle

8c01824a · Adding upstream version 2.6.1. · Feb 15, 2013

Tagging upstream version 2.6.1.