Merge branch 'release-0.11.1' 0.11.1
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Mon, 1 Oct 2012 19:34:43 +0000 (21:34 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Mon, 1 Oct 2012 19:34:43 +0000 (21:34 +0200)

Trivial merge