From b4a5b3ce14fde94fc34eaccb990544c60472ce19 Mon Sep 17 00:00:00 2001
From: Martin Pärtel <martin.partel@gmail.com>
Date: Fri, 1 Mar 2013 02:47:21 +0200
Subject: Released 1.12.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 2ba015e..a39a075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+2013-03-01  Martin Pärtel <martin dot partel at gmail dot com>
+
+	* Deprecated --user, --owner and --group
+	  in favor of --force-user and --force-group
+	  to avoid conflict with standard mount options
+	  (issue 25).
+	* Release 1.12
+
 2012-09-15  Martin Pärtel <martin dot partel at gmail dot com>
 
 	* Fix for setgid directories by Jonathan Dieter. Thanks!
 	* Run in singlethreaded mode by default.
-	* Added -multithreaded option.
+	* Added --multithreaded option.
 	* Documented a race condition in multithreaded mode.
 	* Released 1.11
 
-- 
cgit v1.2.3