From c902a858d7a79e7da947e9a91d110ee8668db913 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Thu, 7 Jul 2005 12:35:37 +0000
Subject: fix

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

(limited to 'ChangeLog')

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
-- 
cgit v1.2.3