Ben Hines cf847e0410 Merge branch 'master' into environments_wip ... Conflicts: Vagrantfile vagrant.gemspec		2015-04-11 13:33:32 -07:00
..
config	Merge branch 'master' into environments_wip	2015-04-11 13:33:32 -07:00
provisioner	Merge branch 'master' into environments_wip	2015-04-11 13:33:32 -07:00
plugin.rb	Use the more canonical require_relative to include files	2014-09-15 21:49:37 -07:00