ansible/ansible — pull request #8472 by raboof (2014-08-06 14:19:46+00:00)
Title: Lookup vault file

* Merged devel into boca's pull request at https://github.com/ansible/ansible/pull/8110
* Fixed a small merge conflict
* Ran 'make tests'