Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 6 Jan 2011 14:50:28 +0000 (15:50 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 6 Jan 2011 14:50:28 +0000 (15:50 +0100)
commit3ff1cdf09693a28719246a9a98a8b908e8c848f7
tree47f2825b3570edafe7e2b3a001887072c84f3996
parent02de134dcf3d4500ae02320aab2dae827d499fa1
parent7b6e0780d1ddb377e66821aca6e3a8d8af10490a
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/main/SonePlugin.java