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

[Kevin Fenzi]

commit b1bf55fc8ed1a299eae9d455d2c8e9f034aed886
Merge: 9bf81db d1dfb02
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Dec 15 13:22:28 2014 -0700

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

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