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

[Kevin Fenzi]

commit a7b4e000c95b312f804df5c178ae1d81c938ca8c
Merge: e04920e efb5883
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Sep 19 10:58:06 2013 -0600

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

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