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
..
azure	Use string concatenation instead of format()	2014-05-04 13:41:15 +02:00
ec2	Merge branch 'master' into development	2014-05-08 23:00:54 +02:00
gce	Use string concatenation instead of format()	2014-05-04 13:41:15 +02:00
kvm	Fix import errors, again.	2014-05-03 17:04:37 +02:00
virtualbox	Use string concatenation instead of format()	2014-05-04 13:41:15 +02:00
__init__.py	Move code into proper package folder	2014-04-02 21:26:13 +02:00