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)
commit4a0c67e05ac11c36484cbea260a5c94a7e63175f
tree79535de1553c9388bb12df1416c72c28b5cb8c4c
parenta90c83da842c28f0e045d8a09dd3480643cd87f1
parent2ade26c061c99897b9d4f2453f60b2d00209706e
Merge branch 'fix-avatar-selection-309' into next