From f04bb181692fc45eec105bd216648d274dbfb0cb Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sat, 9 Jun 2012 21:34:38 -0700
Subject: [PATCH] Updated changelog

---
 guacd/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/guacd/ChangeLog b/guacd/ChangeLog
index 83c2bbdd..347c47ea 100644
--- a/guacd/ChangeLog
+++ b/guacd/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-24 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+	* Update README and manpage
+
+2012-05-23 David Pham-Van <d.pham-van@ulteo.com>
+
+	* Add foreground option to daemon
+
 2012-05-04 Michael Jumper <zhangmaike@users.sourceforge.net>
 
 	* Migrated to libguac 0.6.0