Merge branch 'master' into develop

Daniel J Holmes (jaitaiwan) · Daniel J Holmes (jaitaiwan) · commit 0e500eb683dd · 2015-09-12T21:34:42.000+10:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/joestump/python-oauth2.svg)](https://travis-ci.org/joestump/python-oauth2)
+[![Join the chat at https://gitter.im/joestump/python-oauth2](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/joestump/python-oauth2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # Overview
 python-oauth2 is a python oauth library fully compatible with python versions: 2.6, 2.7, 3.3 and 3.4. This library is depended on by many other downstream packages such as Flask-Oauth.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![Build Status](https://travis-ci.org/joestump/python-oauth2.svg)](https://travis-ci.org/joestump/python-oauth2)`
	`1`	`+[![Join the chat at https://gitter.im/joestump/python-oauth2](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/joestump/python-oauth2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)`
`2`	`2`
`3`	`3`	`# Overview`
`4`	`4`	`python-oauth2 is a python oauth library fully compatible with python versions: 2.6, 2.7, 3.3 and 3.4. This library is depended on by many other downstream packages such as Flask-Oauth.`