Merge remote-tracking branch 'upstream/master' into change_email
authorRodney Ewing <ewing.rj@gmail.com>
Tue, 28 May 2013 17:46:46 +0000 (10:46 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Tue, 28 May 2013 17:46:46 +0000 (10:46 -0700)
commit8087f56b07b11a8abc1f6d5108a70765712cc63d
tree7002a38f819f8ccfc505494c9eb6d6d0ed388f33
parent377db0e7ffdca6ce56041d28eba536ecd3b2a58a
parentf9e032212dff4d54de644cb5537bc0bef6d24c7f
Merge remote-tracking branch 'upstream/master' into change_email

Conflicts:
mediagoblin/auth/lib.py
mediagoblin/auth/tools.py