From bced1ec52a1443df6e5c49f181f07b0d42fd3a34 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Nov 21 2013 20:59:30 +0000
Subject: Merge remote-tracking branch 'origin/master' into f18


---

diff --git a/.gitignore b/.gitignore
index 8a5962e..0f29051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /ansible-1.3.2.tar.gz
 /ansible-1.3.3.tar.gz
 /ansible-1.3.4.tar.gz
+/ansible-1.4.tar.gz
diff --git a/ansible.spec b/ansible.spec
index 8bec1e2..7da6b5e 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 1.3.4
+Version: 1.4
 Release: 1%{?dist}
 
 Group: Development/Libraries
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/playbooks
 
 %changelog
+* Thu Nov 21 2013 Kevin Fenzi <kevin@scrye.com> 1.4-1
+- Update to 1.4
+
 * Tue Oct 29 2013 Kevin Fenzi <kevin@scrye.com> 1.3.4-1
 - Update to 1.3.4
 
diff --git a/sources b/sources
index d5ef5e3..4b012e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac03f64dae45fe9c034fa6f2ec98c8d2  ansible-1.3.4.tar.gz
+adc8b5113e4082d1d435642a381eea0d  ansible-1.4.tar.gz