Clarify the unit of time for ninja_edit_window
remove reinvention of #parameterize
cleaned up discourse_plugin
use omniauth-openid to replace google id
move all logic to omniauth

implement omniauth-facebook / omniauth-twitter
move 3 test to 1
merge master
minor 404 page improvements
first step of variable-izing the /tos
using redis as backend store
scope google search on 404 to domain
no uppercasin'
require 50 read posts, not 100, for basic user
Added method for testing ember stuff
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
Merge branch 'master' of github.com:discourse/discourse
missed this. was inserting dupes when loading more
13 sucks
less magic numbers
Update app/controllers/categories_controller.rb

Fix extra whitespace and hash style.

Comply with a style guide like in Github.
correcting some typos in locales/en.yml