Joshua Hesketh 0aa7e8bdbf Merge branch 'master' into v3_merge
Includes minor py3 fixes (for pep8 on py3).

 Conflicts:
	tests/base.py
	tests/test_model.py
	tests/test_scheduler.py
	tox.ini
	zuul/model.py
	zuul/reporter/__init__.py
	zuul/scheduler.py
	zuul/source/gerrit.py

Change-Id: I99daf9acd746767967b42396881a2dff82134a07
2016-07-14 22:36:59 +10:00
..
2016-07-14 22:36:59 +10:00
2016-07-14 22:36:59 +10:00
2016-02-12 14:10:03 +11:00
2012-05-29 14:49:32 -07:00
2016-07-14 22:36:59 +10:00
2015-07-31 17:00:50 -07:00
2013-06-25 19:04:30 +00:00