summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2014-01-10 05:24:16 +0100
committerAndi Albrecht <albrecht.andi@gmail.com>2014-01-10 05:24:16 +0100
commit524a1e59d1c700337bcbd9ac198db3680c7d5829 (patch)
tree7ec5ceffc0607e83c7339bf8d054da3787112860
parent810b546924697aa67e74cdd82f44d074cb7d0413 (diff)
downloadsqlparse-524a1e59d1c700337bcbd9ac198db3680c7d5829.tar.gz
Update authors and changelog.
-rw-r--r--AUTHORS1
-rw-r--r--CHANGES1
2 files changed, 2 insertions, 0 deletions
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).