Merge branch 'next' into edit-wot-trust
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 1 Jan 2011 23:57:17 +0000 (00:57 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 1 Jan 2011 23:57:17 +0000 (00:57 +0100)
1  2 
src/main/resources/i18n/sone.en.properties
src/main/resources/static/css/sone.css