Merge branch 'maint-1.5.4' into maint-1.5.5

diff --git a/patch-id.c b/patch-id.c
index 086d2d9c68835c6a7434932f6e3b430e0906578d..9349bc5580456b378d41da7cc2518e4fa9a7e81a 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
@@ -81,4 +81,4 @@ int main(int argc, char **argv)
 
        generate_id_list();
        return 0;
-}      
+}