Merge remote-tracking branch 'origin/master' into el6

.gitignore

@@ -1,2 +1,3 @@
 /ansible-1.1.tar.gz
 /ansible-1.2.tar.gz
+/ansible-1.2.1.tar.gz

ansible.spec

@@ -6,7 +6,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Name: ansible
 Release: 1%{?dist}
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 1.2
+Version: 1.2.1
 
 Group: Development/Libraries
 License: GPLv3
@@ -94,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md PKG-INFO COPYING
 
 %changelog
+* Thu Jul 04 2013 Kevin Fenzi <kevin@scrye.com> 1.2.1-1
+- Update to 1.2.1
+- Fixes CVE-2013-2233
+
 * Mon Jun 10 2013 Kevin Fenzi <kevin@scrye.com> 1.2-1
 - Update to 1.2
 

sources

@@ -1 +1 @@
-e1924c5f75a06dc49664e0e9b8f81fa0  ansible-1.2.tar.gz
+5d583f2ca671539a2df05d3c94f10b16  ansible-1.2.1.tar.gz