Merge remote-tracking branch 'githubmirror/master' into HEAD
authormh <mh@immerda.ch>
Sat, 19 Jan 2013 12:06:27 +0000 (13:06 +0100)
committermh <mh@immerda.ch>
Sat, 19 Jan 2013 12:06:27 +0000 (13:06 +0100)

Trivial merge