Merge pull request #156 from kodkultur/master
authorJoshua Roesslein <jroesslein@gmail.com>
Sun, 19 Aug 2012 09:31:09 +0000 (02:31 -0700)
committerJoshua Roesslein <jroesslein@gmail.com>
Sun, 19 Aug 2012 09:31:09 +0000 (02:31 -0700)
Implemented /friendships/lookup

1  2 
tweepy/api.py
tweepy/models.py

diff --cc tweepy/api.py
Simple merge
Simple merge