From 524a1e59d1c700337bcbd9ac198db3680c7d5829 Mon Sep 17 00:00:00 2001
From: Andi Albrecht <albrecht.andi@gmail.com>
Date: Fri, 10 Jan 2014 05:24:16 +0100
Subject: Update authors and changelog.

---
 AUTHORS | 1 +
 CHANGES | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 4352e92..8b7e057 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ the pygments project that was written by Georg Brandl.
 Alphabetical list of contributors:
 * Alexander Beedie <ayembee@gmail.com>
 * Alexey Malyshev <nostrict@gmail.com>
+* Cristian Orellana <cristiano@groupon.com>
 * Florian Bauer <florian.bauer@zmdi.com>
 * Jesús Leganés Combarro "Piranna" <piranna@gmail.com>
 * Kevin Jing Qiu <kevin.jing.qiu@gmail.com>
diff --git a/CHANGES b/CHANGES
index 1291ae5..2331373 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ Development
 
 Bug Fixes
 * Fix incorrect parsing of string literals containing line breaks (issue118).
+* Fix typo in keywords, add MERGE keywords (issue122, by Cristian Orellana).
 
 Enhancements
 * Classify DML keywords (issue116, by Victor Hahn).
-- 
cgit v1.2.1