Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 19:35:03 +0000 (20:35 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 19:35:03 +0000 (20:35 +0100)
commita211a3bd360593efc9e7fba33d607a3b14d0a965
tree7210c0d420b12ee1da5bddf4166297e28a87059e
parentdb7d24156074d2735db4048a0e83cfe807500b3c
parent315ae43e3471f9385d422ef41c3f013fdccfc1d2
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/main/SonePlugin.java