From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 26 Nov 2010 23:48:44 +0000 (+0100)
Subject: Merge commit '0.3.1' into message-recipient
X-Git-Tag: 0.3.2-RC1~15^2
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=96fcb6d250349cb1c02df44d6e3acdb93c8e7370

Merge commit '0.3.1' into message-recipient

Conflicts:
	src/main/resources/templates/viewSone.html
---

96fcb6d250349cb1c02df44d6e3acdb93c8e7370