[MySQL-zrm/f13/master] - Upgrade to 2.2.0 (bz#633912)

[ksyz]

commit 2b01a74d5f5789afc5fe50dd632e3931a0c8eab4
Author: Michal Ingeli <mi at v3.sk>
Date:   Wed Sep 15 12:17:54 2010 +0200

    - Upgrade to 2.2.0 (bz#633912)

 .gitignore     |    1 +
 MySQL-zrm.spec |   17 +++++++++++++++--
 sources        |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23ce403..fd809ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 MySQL-zrm-2.1.1.tar.gz
+/MySQL-zrm-2.2.0.tar.gz
diff --git a/MySQL-zrm.spec b/MySQL-zrm.spec
index b5a40db..47b7e4c 100644
--- a/MySQL-zrm.spec
+++ b/MySQL-zrm.spec
@@ -1,13 +1,17 @@
 Name:		MySQL-zrm
+<<<<<<< HEAD
 Version:	2.1.1
 Release:	6%{?dist}
+=======
+Version:	2.2.0
+Release:	1%{?dist}
+>>>>>>> 56f0c6b... - Upgrade to 2.2.0 (bz#633912)
 Summary:	MySQL backup manager
 
 Group:		Applications/System
 License:	GPLv2
 URL:		http://www.zmanda.com/backup-mysql.html
-Source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/%{version}/Source/MySQL-zrm-%{version}.tar.gz
-
+source0:	http://www.zmanda.com/downloads/community/ZRM-MySQL/2.2/Source/MySQL-zrm-%{version}.tar.gz
 Patch0:		MySQL-zrm-disable-xinetd-service.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -91,6 +95,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+<<<<<<< HEAD
+=======
+* Wed Sep 15 2010 Michal Ingeli <mi at v3.sk> - 2.2.0-1
+- Upgrade to 2.2.0 (bz#633912)
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 2.1.1-7
+- Mass rebuild with perl-5.12.0
+
+>>>>>>> 56f0c6b... - Upgrade to 2.2.0 (bz#633912)
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.1.1-6
 - rebuild against perl 5.10.1
 
diff --git a/sources b/sources
index 360b606..c25791e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f7d21a95aa65e9c57cc8c771e573174  MySQL-zrm-2.1.1.tar.gz
+913682241e097133ff90dcf85812ff8a  MySQL-zrm-2.2.0.tar.gz