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

[Kevin Fenzi]

commit 5c120238e273e4227eeadeaa30386f10510a6470
Merge: 64c270e 6a1b38a
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Nov 27 17:05:43 2013 -0700

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

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