Merge branch 'paulproteus/master'

Ask Solem · Ask Solem · commit 12e14ed218cb · 2010-05-18T15:08:20.000+02:00
Conflicts:
	github2/request.py
diff --git a/github2/request.py b/github2/request.py
@@ -2,7 +2,10 @@
 import httplib
 import simplejson
 from urlparse import urlparse, urlunparse
-from cgi import parse_qs # 2.5 compat
+try:
+    from urlparse import parse_qs
+except ImportError:
+    from cgi import parse_qs
 from urllib import urlencode
 
 GITHUB_URL = "http://github.com"
