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

[Kevin Fenzi]

commit 9bf81dbe88a9b9cc6c6093a65846566a1ec77011
Merge: eebc464 2d564c6
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Nov 28 10:38:23 2014 -0700

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

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