Merge remote-tracking branch 'githubmirror/master' into HEAD
authormh <mh@immerda.ch>
Mon, 18 Mar 2013 14:37:29 +0000 (15:37 +0100)
committermh <mh@immerda.ch>
Mon, 18 Mar 2013 14:37:29 +0000 (15:37 +0100)

Trivial merge