Update, nees squash
Updated, needs squashed
Merge branch 'issue#132' of http://github.com/cosmin-malutan/mozmill-automation into issue#132

Conflicts:
	mozmill_automation/testrun.py