Bug 1094293 - Pass env to ScriptFactory steps - r=jlund
Bug 1013493: disable merging nightly test jobs; add support for 'merge_builds' branch config, which can be used to disable merging of builds on a branch. r=rail
Merging from default

changeset:   3981:7eef3d9293d2
parent:      3977:916e55951a41
user:        Chris Cooper <ccooper@deadsquid.com>
date:        Fri Nov 28 09:34:11 2014 -0500
summary:     Bug 1094293 - Pass env to ScriptFactory steps - r=jlund

changeset:   3982:4a4350574867
tag:         tip
user:        Chris AtLee <catlee@mozilla.com>
date:        Fri Nov 28 10:29:27 2014 -0500
summary:     Bug 1013493: disable merging nightly test jobs; add support for 'merge_builds' branch config, which can be used to disable merging of builds on a branch. r=rail

--HG--
branch : production-0.8