Merge pull request #235.
authorJoshua Roesslein <jroesslein@gmail.com>
Fri, 27 Dec 2013 18:14:39 +0000 (12:14 -0600)
committerJoshua Roesslein <jroesslein@gmail.com>
Fri, 27 Dec 2013 18:14:39 +0000 (12:14 -0600)
commitb322dd231f70a24d9cee59e48ee1478cf05978ea
tree060eaf444d341b740d7ccfb2a29fa3db11555b74
parent7a0a6fa40c04a60f333541d094aeced5d7dc63f4
parent9a5c56f4da85e64dc988f2027ac30310c247a17d
Merge pull request #235.

Conflicts:
tweepy/api.py
tweepy/api.py