Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 21 Sep 2012 21:20:59 +0000 (23:20 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 21 Sep 2012 21:20:59 +0000 (23:20 +0200)

Trivial merge