Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 18 Dec 2010 11:10:49 +0000 (12:10 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 18 Dec 2010 11:10:49 +0000 (12:10 +0100)
commit316b9c2b3d16792975434644ae39a9b1814f32c4
treebd50d2a2a25c0943232d1988f13c779d5b4c7a33
parent0da3fe68ecd25fdfc5eca94f939288c9f6273940
parentb36762dd13eed584854aad8e0e365f01f18b1c32
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
src/main/java/net/pterodactylus/sone/web/WebInterface.java