Merge branch 'release-0.11' 0.11
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 21 Sep 2012 21:10:40 +0000 (23:10 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 21 Sep 2012 21:10:40 +0000 (23:10 +0200)

Trivial merge