[ansible/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit 6a1e828efcfb60e792a4ff5e5918013c1f114eb8
Merge: 61a2703 13553cc
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Feb 12 20:24:51 2014 -0700

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

 .gitignore   |    1 +
 ansible.spec |    9 ++++++---
 sources      |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---