From 550f1bf45c51ccc8f3298450be97105dd6a672a4 Mon Sep 17 00:00:00 2001
From: Claudio Cicali <claudio.cicali@gmail.com>
Date: Thu, 9 Oct 2014 21:40:44 +0200
Subject: [PATCH] Preparing 1.2.0

---
 AUTHORS      | 12 +++++++++++-
 ChangeLog.md | 14 ++++++++++++++
 jingo        |  2 +-
 package.json |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 36afb773..bbd81994 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,12 @@
+
+Main developer
+==============
+
 Claudio Cicali <claudio.cicali@gmail.com>
-http://ccl.me
\ No newline at end of file
+http://ccl.me
+
+Noteworthy contributors
+=======================
+
+David McFadzean (static assets management)
+https://github.com/macterra
\ No newline at end of file
diff --git a/ChangeLog.md b/ChangeLog.md
index 35beb6c0..d83447b2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,17 @@
+
+Version 1.2.0, October 9, 2014
+=================================
+
+- Adds support for the GitHub logins
+- Adds support to be able to serve images and other assets from the repo
+
+Version 1.1.0, September 23, 2014
+=================================
+
+The markdown module we use (Marked) tries to overcome some "obscure" problems with the original Perl markdown parser by default. These produces some problems when rendering HTML embedded in a markdown document see also issue #48. By default we now want to use the original parser and not the modified one (pedantic: true).
+
+There is a new option to override this behaviour (application.pedanticMarkdown).
+
 Version 1.0.0, July 31, 2014
 =============================
 
diff --git a/jingo b/jingo
index 8c00f15e..5757a0bd 100755
--- a/jingo
+++ b/jingo
@@ -18,7 +18,7 @@ var program = require('commander'),
 
 global.Git = require('./lib/gitmech');
 
-program.version('1.1.0')
+program.version('1.2.0')
        .option('-c, --config <path>', 'Specify the config file')
        .option('-#, --hash-string <string>', 'Create an hash for a string')
        .option('-l, --local', 'Listen on localhost only')
diff --git a/package.json b/package.json
index 795d7000..f6f093b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jingo",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A nodejs based wiki engine (sort of Gollum port)",
   "author": "Claudio Cicali <claudio.cicali@gmail.com>",
   "keywords": [