Merge branch 'ls/p4-keep-empty-commits' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 037c57e94d24d9ef713101dcecd1a1ec03fc0a29..f2a001f6c0f4073be588ee5e12b2b62e61fd4b9b 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.0-rc2
+DEF_VER=v2.6.4
 
 LF='
 '