Merge branch 'custom-avatars' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 7 Dec 2011 17:46:38 +0000 (18:46 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 7 Dec 2011 17:46:43 +0000 (18:46 +0100)
This resolves #163.


Trivial merge