Merge branch 'master' of git://github.com/derf/feh

1 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b347b94..13263d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
-git HEAD
+Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>
 
-    * Add R, * and / aliases for <keypad begin>, <keypad *> and <keypad />
+* Release v2.5
+
+    * Add R, * and / bindings for <keypad begin>, <keypad *> and <keypad />
     * 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}
+    * Clean up temporary / to-delete files when receiving SIG{INT,TERM,QUIT}
     * Do not scroll past image borders when using key bindings
     * --loadable / --unloadable: indicate result in exit status