Fabio Rehm b7dbfc84af Merge branch 'master' of github.com:jefmathiot/vagrant-lxc ... Conflicts: lib/vagrant-lxc/plugin.rb		2014-03-21 19:38:35 -03:00
..
vagrant-backports	backports: Add IsState	2014-03-13 00:57:37 -03:00
vagrant-lxc	Merge branch 'master' of github.com:jefmathiot/vagrant-lxc	2014-03-21 19:38:35 -03:00
vagrant-lxc.rb	core: Make lxc-template optional [GH-254]	2014-03-14 00:32:03 -03:00