Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 6 Jan 2011 06:56:28 +0000 (07:56 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 6 Jan 2011 06:56:28 +0000 (07:56 +0100)
commit02de134dcf3d4500ae02320aab2dae827d499fa1
tree1123dc7d643b1f7512941cde76050f991b8f037d
parent1f70b96444f309fbbf338d474af395ff615d244b
parent562917cdfe1eaa69677b0c777b15c223570bca03
Merge branch 'next' into edit-wot-trust
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
src/main/resources/i18n/sone.en.properties
src/main/resources/static/css/sone.css