Merge branch 'oauth'
authorJosh Roesslein <jroesslein@gmail.com>
Thu, 30 Jul 2009 23:09:54 +0000 (18:09 -0500)
committerJosh Roesslein <jroesslein@gmail.com>
Thu, 30 Jul 2009 23:09:54 +0000 (18:09 -0500)
Conflicts:
tests.py


Trivial merge