Merge branch 'fix-avatar-selection-309' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 19 Dec 2012 16:22:49 +0000 (17:22 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 19 Dec 2012 16:22:49 +0000 (17:22 +0100)

Trivial merge