From 9ae85cb780ad79fd618e0049728cbb6aab8acb5a Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sat, 11 Aug 2012 14:16:07 -0700
Subject: [PATCH] Update changelog

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

diff --git a/ChangeLog b/ChangeLog
index 7ae950e..cba8196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-11 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Migrate to guacamole-common 0.6.1
+	* Migrate to guacamole-common-js 0.6.1
+
+2012-06-03 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Fix clipboard blur bug
+
 2012-05-04 Michael Jumper <zhangmaike@users.sourceforge.net>
 
 	* Touch-specific menus and keyboard support
-- 
1.7.10.4