Merge branch 'master' of github.com:simplegeo/python-oauth2 into pending

zookos · zookos · commit e1aed5705373 · 2011-01-24T15:01:30.000-07:00
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+python-oauth2 (1.4.143) lucid; urgency=low
+
+  [ Zooko Ofsimplegeo ]
+  * use two-part version number -- version is manually modified, build-
+    number is automatically modified
+
+  [ Simple Geebus ]
+
+  [ SimpleGeo Nerds ]
+
+ -- SimpleGeo Nerds <nerds@simplegeo.com>  Mon, 24 Jan 2011 20:21:20 +0000
+
 python-oauth2 (1.4.134) lucid; urgency=low
 
   * UNRELEASED
diff --git a/oauth2/_version.py b/oauth2/_version.py
@@ -4,7 +4,7 @@
 
 
 
-auto_build_num = "134"
+auto_build_num = "143"
 
 
 
