From 46d49d7b9eb1a433f89461279fdd0ec4ba0bdf95 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Mar 09 2015 13:09:35 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim


Conflicts:
	vim.spec

---

diff --git a/vim.spec b/vim.spec
index 3acfe6c..94bac88 100644
--- a/vim.spec
+++ b/vim.spec
@@ -2048,6 +2048,9 @@ rm -rf %{buildroot}
 * Fri Feb 27 2015 Karsten Hopp <karsten@redhat.com> 7.4.643-1
 - patchlevel 643
 
+* Mon Mar 02 2015 Dave Airlie <airlied@redhat.com> 7.4.640-4
+- fix vimrc using wrong comment character
+
 * Thu Feb 26 2015 Karsten Hopp <karsten@redhat.com> 7.4.640-3
 - bump release
 
diff --git a/vimrc b/vimrc
index 6421289..a60ce24 100644
--- a/vimrc
+++ b/vimrc
@@ -59,7 +59,7 @@ if &term=="xterm"
      set t_Sf=[3%dm
 endif
 
-# rhbz 1159920
+" rhbz 1159920
 if $COLORTERM=="gnome-terminal"
      set background=light
 else