Merge branch 'release-0.12' 0.12
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 3 Feb 2015 17:58:50 +0000 (18:58 +0100)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 3 Feb 2015 17:58:50 +0000 (18:58 +0100)

Trivial merge