Merge branch 'maint'

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d0b60f40d80017b4638a403ff4b0ec05550014b2..f60bab896bd9a54714eff3596e38c9ffb9d38ac8 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.5-rc1.GIT
+DEF_VER=v1.5.5.GIT
 
 LF='
 '