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

[Kevin Fenzi]

commit 4571fca5e4c3fa44efb651af2fb887039c8c310a
Merge: cea3815 c7e2510
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Feb 19 11:35:51 2015 -0700

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

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