[vim: 25/25] Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim

[Karsten Hopp]

commit 46d49d7b9eb1a433f89461279fdd0ec4ba0bdf95
Merge: 74f9764 f5b807f
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Mar 9 14:09:35 2015 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim
    
    Conflicts:
    	vim.spec

 vim.spec | 3 +++
 vimrc    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --cc vim.spec
index 3acfe6c,a4b98e0..94bac88
--- a/vim.spec
+++ b/vim.spec
@@@ -2030,24 -1994,9 +2030,27 @@@ rm -rf %{buildroot
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
 +* Sun Mar 08 2015 Karsten Hopp <karsten at redhat.com> 7.4.658-1
 +- patchlevel 658
 +
 +* Sat Mar 07 2015 Karsten Hopp <karsten at redhat.com> 7.4.657-1
 +- patchlevel 657
 +
 +* Fri Mar 06 2015 Karsten Hopp <karsten at redhat.com> 7.4.656-1
 +- patchlevel 656
 +
 +* Thu Mar 05 2015 Karsten Hopp <karsten at redhat.com> 7.4.652-1
 +- patchlevel 652
 +
 +* Sat Feb 28 2015 Karsten Hopp <karsten at redhat.com> 7.4.648-1
 +- patchlevel 648
 +
 +* Fri Feb 27 2015 Karsten Hopp <karsten at redhat.com> 7.4.643-1
 +- patchlevel 643
 +
+ * Mon Mar 02 2015 Dave Airlie <airlied at redhat.com> 7.4.640-4
+ - fix vimrc using wrong comment character
+ 
  * Thu Feb 26 2015 Karsten Hopp <karsten at redhat.com> 7.4.640-3
  - bump release