Merge branch 'master' of git.auf:ansible
authorPatrick Hetu <patrick.hetu@auf.org>
Wed, 20 Aug 2014 17:18:01 +0000 (13:18 -0400)
committerPatrick Hetu <patrick.hetu@auf.org>
Wed, 20 Aug 2014 17:18:01 +0000 (13:18 -0400)

Trivial merge