Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 20:39:40 +0000 (21:39 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 20:39:40 +0000 (21:39 +0100)
commit4a2fdf3b0b3dfcfc761c83797018237ec4c82a4b
treede049093d7dbc865ffcaa62a7bed6bb42ae91be4
parenta211a3bd360593efc9e7fba33d607a3b14d0a965
parenta4f8fd83799515684b86e2257b4fcc7a15cbe670
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/core/Core.java