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)
commit14dd8f2dcddb3ebfa0618677f10fe11b8f86ecdd
tree2d9978075798d8508590aaae6355dbd52a7b0bf1
parentf4a0aeb375542f8234cff6209d1557fde0b3185d
parentd37c99d835abafa7c36af3f575dbadaa4b5f76c8
Merge branch 'custom-avatars' into next

This resolves #163.