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

.gitignore

@@ -2,3 +2,4 @@
 /ansible-1.2.tar.gz
 /ansible-1.2.1.tar.gz
 /ansible-1.2.2.tar.gz
+/ansible-1.2.3.tar.gz

ansible.spec

@@ -4,9 +4,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 %endif
 
 Name: ansible
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 1.2.2
+Version: 1.2.3
 
 Group: Development/Libraries
 License: GPLv3
@@ -94,6 +94,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md PKG-INFO COPYING
 
 %changelog
+* Wed Aug 21 2013 Kevin Fenzi <kevin@scrye.com> 1.2.3-2
+- Update to 1.2.3
+- Fixes CVE-2013-4260 and CVE-2013-4259
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Sat Jul 06 2013 Kevin Fenzi <kevin@scrye.com> 1.2.2-1
 - Update to 1.2.2 with minor fixes
 

sources

@@ -1 +1 @@
-f49abd7a34eab0e073dab1080ef88078  ansible-1.2.2.tar.gz
+1e07d0fed888a7230b9727bb2c12e8f7  ansible-1.2.3.tar.gz