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

[Kevin Fenzi]

commit 7726dc7e5d29b84c3a0295772a871161eb0b0838
Merge: 6a1e828 f9dbd15
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Feb 28 14:29:24 2014 -0700

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

 .gitignore   |    1 +
 ansible.spec |   11 +++++------
 sources      |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---