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)
commit437147c8b5d4c6630b6ee9323f9778bb9c13e7f4
tree4b476b5bba4aff4ec630011393eba7bf72481454
parent4d9ef6eb7811d637b7c04694bf0c5f16e9b5e2f6
parent0f67f70b9e9e088e280ee530bbd433415028e8e2
Merge branch 'next' into edit-wot-trust
src/main/resources/i18n/sone.en.properties
src/main/resources/static/css/sone.css