From 14d54cf549262ab3424ad292de493bc65b826a1e Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Mon, 15 Oct 2012 10:42:03 -0700
Subject: [PATCH] Update ChangeLog, bump version.

---
 guacamole-common-js/ChangeLog | 4 ++++
 guacamole-common-js/pom.xml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/guacamole-common-js/ChangeLog b/guacamole-common-js/ChangeLog
index c1cb0911f..8b47d6718 100644
--- a/guacamole-common-js/ChangeLog
+++ b/guacamole-common-js/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-27 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Fix variable naming conflict (ticket #191)
+
 2012-08-11 Michael Jumper <zhangmaike@users.sourceforge.net>
 
 	* Improve documentation
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index 8105af4ab..55fb3e1f6 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -5,7 +5,7 @@
     <groupId>net.sourceforge.guacamole</groupId>
     <artifactId>guacamole-common-js</artifactId>
     <packaging>pom</packaging>
-    <version>0.6.1</version>
+    <version>0.6.2</version>
     <name>guacamole-common-js</name>
     <url>http://guac-dev.org/</url>