Merge pull request googleapis#116 from nathanielmanistaatgoogle/master

Release v1.4.6.

Author: soltanmm

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v1.4.6
+
+* Add utility function to convert PKCS12 key to PEM. (#115)
+* Change GCE detection logic. (#93)
+* Add a tox env for doc generation.
+
 ## v1.4.5
 
 * Set a shorter timeout for an Application Default Credentials issue on some

oauth2client/__init__.py

@@ -1,6 +1,6 @@
 """Client library for using OAuth2, especially with Google APIs."""
 
-__version__ = '1.4.5'
+__version__ = '1.4.6'
 
 GOOGLE_AUTH_URI = 'https://accounts.google.com/o/oauth2/auth'
 GOOGLE_DEVICE_URI = 'https://accounts.google.com/o/oauth2/device/code'