Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 21 Dec 2010 11:08:45 +0000 (12:08 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 21 Dec 2010 11:08:45 +0000 (12:08 +0100)
commita8a97f37c2bd64a0bf4fe4cb38d61818f5f9a148
treee8e287e0c53f633d1ddd5e75a171a7919707b9c0
parent316b9c2b3d16792975434644ae39a9b1814f32c4
parentf0b7680701ca1cbcf4b80e49690d9c2d1b2720de
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/core/Core.java