fix merge conflicts
authorOmer Murat Yildirim <omermuratyildirim@gmail.com>
Tue, 23 Sep 2014 17:00:23 +0000 (20:00 +0300)
committerOmer Murat Yildirim <omermuratyildirim@gmail.com>
Tue, 23 Sep 2014 17:00:23 +0000 (20:00 +0300)
commit0368e0d59943885553f31ad1f40cbb8ba4f2a11c
treeb98e26612257a42414217ebf7503894ef0c6cc85
parent725bc3b56e0964fe4c557bc8e5692d0a32733231
fix merge conflicts
tweepy/auth.py