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

[Kevin Fenzi]

commit 7bdbe83aba5226d4899e9469bd4db61be49cbf38
Merge: a7b4e00 8f16660
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Oct 8 16:16:07 2013 -0600

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

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