Merge branch 'f25' into f26

vim-update.sh

@@ -148,7 +148,6 @@ if [ $CHANGES -ne 0 ]; then
      fi
 
      # Increment index and cut the head of releases_regexp string
-     let "branches_index+=1"
      let "release_index+=1"
      releases_regexp=${releases_regexp#*|}
    done

vim.spec

@@ -775,6 +775,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu Oct 26 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1216-2
 - mention GVim in Summary and Description of vim-x11 subpackage
+- update vim-update.sh to merge with the oldest branch
 
 * Wed Oct 25 2017 Karsten Hopp <karsten@redhat.com> 8.0.1216-1
 - patchlevel 1216