[vim: 45/45] Merge commit '9a75430f62cfde14a061ef86cd7e3d7ce3f91ea1'

[Karsten Hopp]

commit 3807a570a4011a39d2f2584fdf83221c177be690
Merge: 036c5ec 9a75430
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Jun 18 13:20:56 2012 +0200

    Merge commit '9a75430f62cfde14a061ef86cd7e3d7ce3f91ea1'
    
    Conflicts:
    	vim.spec

 7.3.516           |   94 +++++
 7.3.517           |   60 +++
 7.3.518           |   57 +++
 7.3.519           |   64 ++++
 7.3.520           |  140 +++++++
 7.3.521           |  129 +++++++
 7.3.522           |   56 +++
 7.3.523           |  103 +++++
 7.3.524           |   46 +++
 7.3.525           |   55 +++
 7.3.526           |   59 +++
 7.3.527           |   59 +++
 7.3.528           |  171 +++++++++
 7.3.529           |   81 ++++
 7.3.530           |   50 +++
 7.3.531           |   52 +++
 7.3.532           |   53 +++
 7.3.533           |   46 +++
 7.3.534           |  101 +++++
 7.3.535           |  356 +++++++++++++++++
 7.3.536           |   73 ++++
 7.3.537           |   47 +++
 7.3.538           |  321 ++++++++++++++++
 7.3.539           |   51 +++
 7.3.540           |   55 +++
 7.3.541           | 1090 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 7.3.542           |   73 ++++
 7.3.543           |   55 +++
 7.3.544           |   81 ++++
 7.3.545           |  359 ++++++++++++++++++
 7.3.546           |   54 +++
 7.3.547           |   52 +++
 7.3.548           |   53 +++
 7.3.549           |  125 ++++++
 7.3.550           |  160 ++++++++
 7.3.551           |  494 ++++++++++++++++++++++++
 7.3.552           |  582 ++++++++++++++++++++++++++++
 7.3.553           |   85 +++++
 7.3.554           |   52 +++
 7.3.555           |  232 ++++++++++++
 7.3.556           |   70 ++++
 README.patches    |   41 ++
 spec-template.new |    3 +-
 vim.spec          |   89 +++++-
 44 files changed, 6125 insertions(+), 4 deletions(-)
---
diff --cc vim.spec
index f322377,b3b5975..a151167
--- a/vim.spec
+++ b/vim.spec
@@@ -1688,9 -1770,9 +1770,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
+ * Mon Jun 18 2012 Karsten Hopp <karsten at redhat.com> 7.3.556-1
+ - patchlevel 556
+ 
 +* Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 2:7.3.515-2
 +- Perl 5.16 rebuild
 +
  * Mon May 21 2012 Karsten Hopp <karsten at redhat.com> 7.3.515-1
  - enable highlighting for older log files (#816848)