Merge branch 'version' of git://github.com/alejandrogomez/tweepy
authorJoshua Roesslein <jroesslein@gmail.com>
Fri, 9 Nov 2012 07:02:53 +0000 (23:02 -0800)
committerJoshua Roesslein <jroesslein@gmail.com>
Fri, 9 Nov 2012 07:02:53 +0000 (23:02 -0800)
commitfa00f59b126e0a9b8431dc213585e73ceceb723f
tree17faabe3c69561a77ace66e3afefb7b2d627e8a2
parent9f244c04307485d3befbe28da3f96c229fe7eba6
parent46298e31e192141f8061f948b19e28cc215f971a
Merge branch 'version' of git://github.com/alejandrogomez/tweepy

Conflicts:
setup.py