Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)
commit7379bb70d4db3b419deed77f0df95f74c4b0e038
treebc2e50150de57676c78dd54897b08fcd3f1b506c
parente9a6150f3d6cf945d10bb5dfc2dad35f1c9b1b9d
parent28e93b0b30bae85b3fd8a6f4348468a4695dbdb0
Merge branch 'next' into edit-wot-trust
pom.xml
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/main/SonePlugin.java