Merge branch 'master' of /home/tklauser/scm/inotail

Conflicts:

	inotail.c

1 files changed, 9 insertions, 0 deletions

diff --git a/changelog b/changelog
index f25cc5e..83696c2 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+inotail 0.6
+
+  * Correctly handle tailing from pipes
+  * Do not try to seek on pipes when following (thanks Alexander Sulfrian)
+  * Handle file truncation in follow mode
+  * Various small fixes
+
+  -- Tobias Klauser <tklauser@distanz.ch> 2008-08-31 21:15
+
 inotail 0.5
 
   * Output verbose file headers correctly when used in a pipe