From 4d616aad19dae1fc68719d002d40b10d1e2c048b Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Jul 06 2015 08:58:12 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim


Conflicts:
	vim.spec

---

diff --git a/vim.spec b/vim.spec
index ed72ec8..db093d8 100644
--- a/vim.spec
+++ b/vim.spec
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -2285,6 +2285,7 @@ rm -rf %{buildroot}
 %{_bindir}/gvimdiff
 %{_bindir}/gview
 %{_bindir}/gex
+%{_bindir}/vimtutor
 %{_bindir}/vimx
 %{_bindir}/evim
 %{_mandir}/man1/evim.*
@@ -2315,6 +2316,9 @@ rm -rf %{buildroot}
 * Wed Jun 10 2015 Karsten Hopp <karsten@redhat.com> 7.4.738-1
 - patchlevel 738
 
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:7.4.737-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Wed Jun 10 2015 Karsten Hopp <karsten@redhat.com> 7.4.737-1
 - patchlevel 737