Merge remote branch 'upstream/master'

1 files changed, 1 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ea7774..b347b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 git HEAD
 
     * Add R, * and / aliases for <keypad begin>, <keypad *> and <keypad />
-    * Try to convert unloadable files with imagemagick for up to 6 seconds
+    * Try to convert unloadable files with imagemagick for up to 5 seconds
     * Add --magick-timeout option to set imagemagick conversion timeout or
       disable it altogether
     * Clean up temporary / to-delete files when receiveng SIG{INT,TERM,QUIT}