Anders Ingemann f50a8e66ce Merge branch 'master' into development ... Conflicts: .gitignore bootstrapvz/common/tasks/apt.py bootstrapvz/plugins/cloud_init/__init__.py bootstrapvz/plugins/cloud_init/tasks.py tox.ini		2014-05-08 23:00:54 +02:00
..
base	Don't allow target in include/exclude_packages	2014-05-08 22:20:48 +02:00
common	Merge branch 'master' into development	2014-05-08 23:00:54 +02:00
plugins	Merge branch 'master' into development	2014-05-08 23:00:54 +02:00
providers	Merge branch 'master' into development	2014-05-08 23:00:54 +02:00
__init__.py	Properly fix imports and make bootstrapvz work like a package	2014-04-02 21:32:10 +02:00