From: Joshua Roesslein <jroesslein@gmail.com>
Date: Sat, 3 Apr 2010 03:00:51 +0000 (-0500)
Subject: Merge 'jnr/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b571c972e7b46a25c1a7df93351744d5b01249ca;p=tweepy.git

Merge 'jnr/master'
---

b571c972e7b46a25c1a7df93351744d5b01249ca
diff --cc CONTRIBUTORS
index 54dff07,54dff07..7346474
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@@ -10,3 -10,3 +10,4 @@@ Bas Westerbaa
  Ivo Wetzel
  Will McCutchen
  Gergely Imreh
++James Rowe