merged with master branch

Author: Sébastien de Melo

.gitignore

@@ -0,0 +1,8 @@
+# Build artifacts
+*.py[cod]
+oauth2client.egg-info/
+build/
+dist/
+
+# Test files
+.tox/

.travis.yml

@@ -0,0 +1,13 @@
+language: python
+python: 2.7
+env:
+  - TOX_ENV=py26
+  - TOX_ENV=py27
+  - TOX_ENV=pypy
+install:
+  - pip install tox
+  - pip install .
+script:
+  - tox -e $TOX_ENV
+notifications:
+  - email: false

MANIFEST.in

@@ -1 +1 @@
-include README
+include README.md

README

@@ -0,0 +1,29 @@
+[![Build Status](https://travis-ci.org/google/oauth2client.svg?branch=master)](https://travis-ci.org/google/oauth2client)
+
+This is a client library for accessing resources protected by OAuth 2.0.
+
+[Full documentation](http://google.github.io/oauth2client/)
+
+Installation
+============
+
+To install, simply say
+
+    $ easy_install --upgrade oauth2client
+
+
+Third Party Libraries
+=====================
+
+These libraries will be installed when you install the client library:
+
+* http://code.google.com/p/httplib2
+* http://pypi.python.org/pypi/simplejson/ (python version < 2.7 only)
+
+Contributing
+============
+
+Please see the
+[contributing page](http://google.github.io/oauth2client/contributing.html)
+for more information. In particular, we love pull requests -- but please make
+sure to sign the contributor license agreement.