From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 7 Dec 2011 17:46:38 +0000 (+0100)
Subject: Merge branch 'custom-avatars' into next
X-Git-Tag: 0.7.6^2~1
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;ds=sidebyside;h=14dd8f2dcddb3ebfa0618677f10fe11b8f86ecdd;hp=14dd8f2dcddb3ebfa0618677f10fe11b8f86ecdd;p=Sone.git

Merge branch 'custom-avatars' into next

This resolves #163.
---