Gilles Cornu c6ef73a6fa Merge 'gildegoma/2103-ansible-local-v2' ... Resolve conflict in CHANGELOG.md		2015-11-10 23:05:29 +01:00
..
vagrant	Merge 'gildegoma/2103-ansible-local-v2'	2015-11-10 23:05:29 +01:00
vagrant.rb	for newer versions of Bundler, store the runtime	2015-07-09 22:12:47 -06:00