Merge branch 'master' into develop

sigmavirus24 · sigmavirus24 · commit 7bc504a390a6 · 2014-01-26T08:07:31.000-06:00
Conflicts:
	github3/__init__.py
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,6 +1,13 @@
 History/Changelog
 -----------------
 
+0.8.1: 2014-01-26
+~~~~~~~~~~~~~~~~~
+
+- Add documentation for using Two Factor Authentication
+
+- Fix oversight where ``github3.login`` could not be used for 2FA
+
 0.8.0: 2014-01-03
 ~~~~~~~~~~~~~~~~~
 
diff --git a/github3/__init__.py b/github3/__init__.py
@@ -14,7 +14,7 @@
 __author__ = 'Ian Cordasco'
 __license__ = 'Modified BSD'
 __copyright__ = 'Copyright 2012-2014 Ian Cordasco'
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 __version_info__ = tuple(int(i) for i in __version__.split('.'))
 
 from github3.api import *
