c8fc2c9 Merge branch 'master' of /git/ansible

Merged and Committed by puiterwijk 9 years ago
    Merge branch 'master' of /git/ansible