From: Joshua Roesslein <jroesslein@gmail.com>
Date: Fri, 9 Nov 2012 07:02:53 +0000 (-0800)
Subject: Merge branch 'version' of git://github.com/alejandrogomez/tweepy
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fa00f59b126e0a9b8431dc213585e73ceceb723f;p=tweepy.git

Merge branch 'version' of git://github.com/alejandrogomez/tweepy

Conflicts:
	setup.py
---

fa00f59b126e0a9b8431dc213585e73ceceb723f