Merge remote-tracking branch 'githubmirror/master'
authormh <mh@immerda.ch>
Fri, 25 Jan 2013 09:59:18 +0000 (10:59 +0100)
committermh <mh@immerda.ch>
Fri, 25 Jan 2013 09:59:18 +0000 (10:59 +0100)

Trivial merge