Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Dec 2010 23:05:17 +0000 (00:05 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Dec 2010 23:05:17 +0000 (00:05 +0100)
commitdb7d24156074d2735db4048a0e83cfe807500b3c
tree4a85d2eb76f6938808627be2e235659b4874548a
parenta8a97f37c2bd64a0bf4fe4cb38d61818f5f9a148
parent66b1ea22fc5b2685ab8d649f270c9c4c4f86e90a
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/core/Core.java