Merge branch 'master' of git@github.com:webmin/webmin

update-from-repo.sh

@@ -139,7 +139,7 @@ if [[ $EUID -eq 0 ]]; then
 
         ####################
         # start processing pulled source
-        version="`head -c -1 ${TEMP}/version`.`cd ${TEMP}; ${GIT} log -1 --format=%cd --date=format:'%m%d.%H%M'`" 
+        version="`head -c -1 ${TEMP}/version`-`cd ${TEMP}; ${GIT} log -1 --format=%cd --date=format:'%m%d.%H%M'`" 
         if [[ "${LANG}" != "YES" ]]; then
           ###############
           # FULL update

webmin/webmin-lib.pl

@@ -764,6 +764,8 @@ Rounds a version number down to the nearest .01
 =cut
 sub base_version
 {
+#remove waning about (possible) postfixes from update-from-repo.sh
+$_[0] =~ s/[-a-z:_].*//gi;
 return sprintf("%.2f0", $_[0]);
 }