Merge branch 'release-0.10' 0.10
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sun, 1 Apr 2012 16:30:06 +0000 (18:30 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sun, 1 Apr 2012 16:30:06 +0000 (18:30 +0200)

Trivial merge