Merge branch 'master' into stable

Merge in master for 1.2.1 release, fixes #50
paypal · Jul 21, 2014 · 8b08c82 · 8b08c82
2 parents 358621d + 8953c39
commit 8b08c82
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@ PyPI status:
 
 [![PyPi version](https://pypip.in/v/paypalrestsdk/badge.png)](https://crate.io/packages/paypalrestsdk/)
 [![PyPi downloads](https://pypip.in/d/paypalrestsdk/badge.png)](https://crate.io/packages/paypalrestsdk/)
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/paypal/rest-api-sdk-python/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
 The PayPal REST SDK provides Python APIs to create, process and manage payment. The [Paypal REST APIs](https://developer.paypal.com/webapps/developer/docs/api/) are fully supported by the sdk.
 

diff --git a/paypalrestsdk/version.py b/paypalrestsdk/version.py
@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = "1.2.1"
diff --git a/release_notes.md b/release_notes.md
@@ -1,6 +1,11 @@
 PayPal Python SDK release notes
 ============================
 
+v1.2.1
+-----
+* Patch for exceptions import issue #50
+* Patch for urlparse import issue
+
 v1.2.0
 -----
 * Subscription (Billing Plan and Billing Agreement) API supported