Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 31 Dec 2010 00:20:07 +0000 (01:20 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 31 Dec 2010 00:20:07 +0000 (01:20 +0100)
commit4d9ef6eb7811d637b7c04694bf0c5f16e9b5e2f6
treede17c315d0111f5cb59a932b061467441e5033b8
parent4a2fdf3b0b3dfcfc761c83797018237ec4c82a4b
parent02fef5ca5b1ce866d4b3858d052414c37dc3dc12
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/main/SonePlugin.java