Merge branch 'master' into next

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d6d1ae0338085d8d3ea567d8007f05ab5f2ee554..d2200acd7aca5172c386e374b95775838658ab68 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.2.GIT
+DEF_VER=v1.3-rc2.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default