1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0b8679..f820dd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-07  Miklos Szeredi <miklos@szeredi.hu>
+
+	* lib: don't allow both 'allow_other' and 'allow_root' options to
+	be given
+
 2005-07-06  Miklos Szeredi <miklos@szeredi.hu>
 
 	* fusermount: check if mountpoint is empty (only '.' and '..' for