from allium
Merge branch 'master' of https://github.com/alexsuse/continuous

Conflicts:
	continuous_multi.py
yep