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
Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting.
change your avatar in a modal
Totally re-write favicon notifier

- Black on white text
- Larger font
- Works with any size favicon (16, 32, 64)
Add 32px image to default favicons (for retina)
Merge pull request #1347 from ZogStriP/change-your-avatar-in-a-modal

change your avatar in a modal
FIX: bench script is not working on OS X
Merge pull request #1349 from ZogStriP/bench-script-is-not-working-on-OS-X

FIX: bench script is not working on OS X
Merge pull request #1348 from chrishunt/dynamically-png-me

Re-write dynamic favicon javascript
include plugins directory
Authenticate with Discourse via OAuth2

See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
omniauth-oauth2 should be required in plugin which uses it
Merge branch 'master' of github.com:discourse/discourse