Merge branch 'release-3.2.0'

kyleconroy · kyleconroy · commit 426fe4374536 · 2011-07-26T06:21:26.000-07:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1'
+version = '3.2'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0'
+release = '3.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name = "twilio",
-    version = "3.1.0",
+    version = "3.2.0",
     description = "Twilio API client and TwiML generator",
     author = "Twilio",
     author_email = "help@twilio.com",
diff --git a/twilio/__init__.py b/twilio/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = ('3', '1', '0')
+__version_info__ = ('3', '2', '0')
 __version__ = '.'.join(__version_info__)
 
 
diff --git a/twilio/rest/resources.py b/twilio/rest/resources.py
@@ -144,7 +144,7 @@ def make_twilio_request(method, uri, **kwargs):
     Make a request to Twilio. Throws an error
     """
     headers = kwargs.get("headers", {})
-    headers["User-Agent"] = "twilio-python"   # Add user aggent string
+    headers["User-Agent"] = "twilio-python/3.2.0"   # Add user aggent string
 
     if method == "POST" and "Content-Type" not in headers:
         headers["Content-Type"] = "application/x-www-form-urlencoded"
