From 20b59d5c31061cef0b28417a66611a07458c36fa Mon Sep 17 00:00:00 2001
From: Michael Lazar <mlazar@knuedge.com>
Date: Thu, 25 Aug 2016 16:14:31 -0700
Subject: [PATCH] Upping version.

---
 AUTHORS.rst        |  5 +++--
 CHANGELOG.rst      | 24 ++++++++++++++++++++++++
 rtv.1              |  2 +-
 rtv/__version__.py |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 27e64ce..791ef57 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -22,13 +22,14 @@ Thanks to the following people for their contributions to this project.
 * `Alex Kahan <https://github.com/alexk307>`_
 * `JuanPablo <https://github.com/juanpabloaj>`_
 * `Robert Greener <https://github.com/ragreener1>`_
+* `nagracks <https://github.com/nagracks>`_
 * `afloofloo <https://github.com/afloofloo>`_
-* `Matthew Smith <https://github.com/msmith491>`_
 * `Marc Abramowitz <https://github.com/msabramo>`_
 * `Hans Roman <https://github.com/snahor>`_
+* `Fabio Alessandro Locati <https://github.com/Fale>`_
+* `Matthew Smith <https://github.com/msmith491>`_
 * `Ram-Z <https://github.com/Ram-Z>`_
 * `Wieland Hoffmann <https://github.com/mineo>`_
 * `Adam Talsma <https://github.com/a-tal>`_
 * `Alexander Terry <https://github.com/mralext20>`_
-* `nagracks <https://github.com/nagracks>`_
 * `peterpans01 <https://github.com/peterpans01>`_
\ No newline at end of file
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1c4830c..1b64d98 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,7 @@
 RTV Changelog
 =============
 
+.. _1.12.0: http://github.com/michael-lazar/rtv/releases/tag/v1.12.0
 .. _1.11.0: http://github.com/michael-lazar/rtv/releases/tag/v1.11.0
 .. _1.10.0: http://github.com/michael-lazar/rtv/releases/tag/v1.10.0
 .. _1.9.1: http://github.com/michael-lazar/rtv/releases/tag/v1.9.1
@@ -20,6 +21,29 @@ RTV Changelog
 .. _1.2.1: http://github.com/michael-lazar/rtv/releases/tag/v1.2.1
 .. _1.2: http://github.com/michael-lazar/rtv/releases/tag/v1.2
 
+--------------------
+1.12.0_ (2016-08-25)
+--------------------
+Features
+
+* Added a help banner with common key bindings.
+* Added `gg` and `G` bindings to jump to the top and bottom the the page.
+* Updated help screen now opens with the system PAGER.
+* The `/` prompt now works from inside of submissions.
+* Added an Instagram parser to extract images and videos from urls.
+
+Bugixes
+
+* Shortened reddit links (https://redd.it/) will now work with ``-s``.
+
+Codebase
+  
+* Removed the Tornado dependency from the project.
+* Added a requirements.txt file.
+* Fixed a bunch of tests where cassettes were not being generated.
+* Added compatability for pytest-xdist.
+
+
 --------------------
 1.11.0_ (2016-08-02)
 --------------------
diff --git a/rtv.1 b/rtv.1
index 9c016e4..11d381e 100644
--- a/rtv.1
+++ b/rtv.1
@@ -1,4 +1,4 @@
-.TH "RTV" "1" "August 03, 2016" "Version 1.11.0" "Usage and Commands"
+.TH "RTV" "1" "August 25, 2016" "Version 1.12.0" "Usage and Commands"
 .SH NAME
 RTV - Reddit Terminal Viewer
 .SH SYNOPSIS
diff --git a/rtv/__version__.py b/rtv/__version__.py
index c861780..107bfe0 100644
--- a/rtv/__version__.py
+++ b/rtv/__version__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '1.11.0'
+__version__ = '1.12.0'