Merge commit '0.3.1' into message-recipient
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 26 Nov 2010 23:48:44 +0000 (00:48 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 26 Nov 2010 23:48:44 +0000 (00:48 +0100)
commit96fcb6d250349cb1c02df44d6e3acdb93c8e7370
tree0cc0cd175eb5be99aee028cfda071524402a0f7f
parentbd56e01d9efa9b54074dad9b698e98e7dc2be46d
parent96ed71e6465ea1b7bc19eb738a3b14fd18672c55
Merge commit '0.3.1' into message-recipient

Conflicts:
src/main/resources/templates/viewSone.html
src/main/resources/static/javascript/sone.js
src/main/resources/templates/viewSone.html