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)
commit62fce9f3796b25278ecad68ad6a2d301b9d2d5b2
treef2c187e54683e1b2dca296fd855710deeed6ff69
parent7384e723e27e5aea395200c78fb4c0f547ed9138
parent876426b7cab2c60f59bb61e492113439e0ede2fd
Merge branch 'oauth'

Conflicts:
tests.py