Merge branch 'release/2.3.1' into develop

RELEASE-NOTES.rst

@@ -2,6 +2,13 @@
 Release Notes for django-sshkey
 ===============================
 
+2.3.1 (2014-07-29)
+------------------
+
+* Add support for Django 1.6
+* Add missing dependency for pyasn1 (introduced in 2.3.0)
+* Add release notes (this file)
+
 2.3.0 (2014-07-07)
 ------------------
 

django_sshkey/__init__.py

@@ -26,4 +26,4 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '2.3.0'
+__version__ = '2.3.1'