From f8e56cc099672dc450ef7ebdcc7148c12573e2e9 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel@molkentin.de>
Date: Thu, 18 Oct 2012 13:11:16 +0400
Subject: [PATCH] Update ChangeLog for 0.60.1

---
 ChangeLog | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 26d4424b2b..75dd8086e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
 ChangeLog
 ==========
-version 0.60.0  (released 2012-09-)
+version 0.60.1  (released 2012-10-18)
+  * Fix improper memory cleanup which could
+            cause memory leaks and crashes
+  * Fix memory leak
+  * Allow single quote (') in file names
+  * Remove stray temporary files
+
+version 0.60.0  (released 2012-10-10)
   * simplification of pac based proxy support. 
+  * syncing algorithm based on ids rather than on timestamps
+  * make it possible to relocate database
 
 version 0.50.11 (third beta version, released 2012-10-05)
   * Renamed ownCloud version of csync to ocsync for ownCloud.