From ca2712e2f0a1bed56498d7f1498acd4b4cdb9107 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

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

diff --git a/ChangeLog b/ChangeLog
index 83c2bbd..347c47e 100644
--- a/ChangeLog
+++ b/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
-- 
1.7.10.4