From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 1 Jan 2011 18:17:58 +0000 (+0100)
Subject: Merge branch 'protocol-version' into next
X-Git-Tag: 0.3.6.3^2~3
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=0f67f70b9e9e088e280ee530bbd433415028e8e2

Merge branch 'protocol-version' into next
---

0f67f70b9e9e088e280ee530bbd433415028e8e2