From 3eb0e0ab55858486f05e33d0d1fadfac9e3c9c84 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Wed, 16 Jan 2013 03:38:29 -0800
Subject: [PATCH] Update ChangeLog

---
 guacamole/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/guacamole/ChangeLog b/guacamole/ChangeLog
index a188c123f..611d86158 100644
--- a/guacamole/ChangeLog
+++ b/guacamole/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-09 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Rewrite parser for user-mapping.xml
+	* Fix truncation of parameter values
+
+2012-12-09 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Sort connection IDs alphabetically
+
 2012-10-24 Michael Jumper <zhangmaike@users.sourceforge.net>
 
 	* Implement auto-scaling