projects / WoTNS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96584d6 a62eda7)
Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 17 Sep 2011 12:58:15 +0000 (14:58 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 17 Sep 2011 12:58:15 +0000 (14:58 +0200)

Trivial merge
Web of Trust Name Service; a DNS-like service on top of Freenet’s Web of Trust.