Merge branch 'next' into edit-wot-trust

author David ‘Bombe’ Roden <bombe@pterodactylus.net>

Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)

committer David ‘Bombe’ Roden <bombe@pterodactylus.net>

Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)
author David ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)
committer David ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)
diff --cc pom.xml
Simple merge
diff --cc src/main/java/net/pterodactylus/sone/core/Core.java
Simple merge
diff --cc src/main/java/net/pterodactylus/sone/main/SonePlugin.java
Simple merge
author	David ‘Bombe’ Roden <bombe@pterodactylus.net>
	Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)
committer	David ‘Bombe’ Roden <bombe@pterodactylus.net>
	Wed, 15 Dec 2010 07:27:42 +0000 (08:27 +0100)
		1	2
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/net/pterodactylus/sone/core/Core.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/net/pterodactylus/sone/main/SonePlugin.java	patch \|	diff1 \|	diff2 \|	blob \| history