FIX: avatars in discourse's topic oneboxes
FIX: N+1 query for avatars when searching for users
Update client.zh_CN.yml
Update client.zh_CN.yml
Update client.zh_CN.yml
Merge pull request #1337 from ZogStriP/avatar-work

Avatar work
Merge pull request #1338 from ofgeek/patch-2

Update client.zh_CN.yml
better copy for password change button
FIX: custom avatars in email
larger avatars in embedded posts
Remove duplication from Guardian
Merge pull request #1342 from gcapizzi/remove_duplication_from_guardian

Remove duplication from Guardian
Merge pull request #1340 from ZogStriP/larger-avatar-in-embedded-posts

larger avatars in embedded posts
Merge pull request #1339 from ZogStriP/fix-custom-avatars-in-email

FIX: custom avatars in email
Add reject option to pending users page
Add tip for installing on Ubuntu 12.10
Add section for additional MIME in nginx
FIX: Footer formatting in digest emails
Merge pull request #1344 from Supermathie/sysadmin-docs

Sysadmin docs
Oops, make highlight in topic list style-able too