From dd169184d8847befcd87f255b986a312177a9b06 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Apr 03 2013 01:50:05 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6


Conflicts:
	.gitignore
	ansible.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index cada7b1..74bdca1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
-/ansible-0.3.1.tar.gz
-/ansible-0.4.1.tar.gz
-/ansible-0.5.1.tar.gz
-/ansible-0.6.tar.gz
-/ansible-0.7.tar.gz
-/ansible-0.7.1.tar.gz
-/ansible-0.8.tar.gz
-/ansible-0.9.tar.gz
-/ansible-1.0.tar.gz
+/ansible-1.1.tar.gz
diff --git a/ansible.spec b/ansible.spec
index f32bc1c..43b89f4 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -6,12 +6,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Name: ansible
 Release: 1%{?dist}
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 1.0
+Version: 1.1
 
 Group: Development/Libraries
 License: GPLv3
-Source0: https://github.com/downloads/ansible/ansible/%{name}-%{version}.tar.gz
-Url: http://ansible.github.com
+Source0: http://ansible.cc/releases/%{name}-%{version}.tar.gz
+Url: http://ansible.cc
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -97,8 +97,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md PKG-INFO COPYING
 
 %changelog
-* Fri Feb 1 2013 Michael DeHaan <michael.dehaan@gmail.com> - 1.0-0
-- Release 1.0
+* Tue Apr 02 2013 Kevin Fenzi <kevin@scrye.com> 1.1-1
+- Update to 1.1
+
+* Mon Mar 18 2013 Kevin Fenzi <kevin@scrye.com> 1.0-1
+- Update to 1.0
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Fri Nov 30 2012 Michael DeHaan <michael.dehaan@gmail.com> - 0.9-0
 - Release 0.9
diff --git a/sources b/sources
index 9720629..b6e5b8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fcfaf789df5f262b5b0702daeaacf20e  ansible-1.0.tar.gz
+29059e7738212392d7c23db8c8f91019  ansible-1.1.tar.gz