fix merge conflicts
authorOmer Murat Yildirim <omermuratyildirim@gmail.com>
Tue, 23 Sep 2014 16:59:17 +0000 (19:59 +0300)
committerOmer Murat Yildirim <omermuratyildirim@gmail.com>
Tue, 23 Sep 2014 16:59:17 +0000 (19:59 +0300)
commit725bc3b56e0964fe4c557bc8e5692d0a32733231
tree63269a8128a3ae7016147713276f363bee1ee50a
parentf2e90c938835694ff2c8cd544d713c5a5f00d8c3
fix merge conflicts
tweepy/auth.py