Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 2 Oct 2012 05:07:02 +0000 (07:07 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 2 Oct 2012 05:07:02 +0000 (07:07 +0200)

Trivial merge