Joshua Hesketh dc7820cf88 Merge branch 'master' into feature/zuulv3 ... Conflicts: zuul/model.py zuul/scheduler.py Change-Id: I2973bfae65b3658549dc13aa3ea0efe60669ba8e		2016-03-11 13:24:00 +11:00
..
__init__.py	Merge branch 'master' into feature/zuulv3	2016-03-11 13:24:00 +11:00
gerrit.py	Merge branch 'master' into feature/zuulv3	2016-03-11 13:24:00 +11:00