Bug 1021230 - Add user 'mozauto' for QA, and changes for x server. r=dustin
Bug 1028104 - tps_ci and mozmill_ci server should have a mozauto builder account. a=org-only
merge build/default to qa/default
Bug 1029614 - Make screenresolution configurable for specific resolutions. r=dustin
Bug 997721 - Add proxy support for gui applications on OS X. r=dustin
Bug 1032133 - Don't inherit environment variables for puppet agent runs. r=dustin
Bug 1008880 - Create Java package. r=dustin
Bug 1039651: always ensure proxy_reset_env.sh exists
Bug 1039651: fix setproxy.sh for OS X, change '.' to 'source'
bug 1040926: consolidate node definitions
bug 1036345: Send ship-it email for Thunderbird on a different address - remove_notify_to_release.diff. r=rail
Bug 1039977, disable mac-signing1 for diagnostics, r=bhearsum
No Bug - Update slaveapi version. r=nthomas

--HG--
extra : rebase_source : 18744d989bdd63b77cb8e5acb25e926dba19798e
bug 984364: add assert module, r=dustin
Bug 1040835: factor out exec with a semaphore into execonce; r=markco

..and refactor firewall::windows_settings to match
Bug 1040842: use mozilla-build for python on windows; r=Callek
Bug 1021230 - Add user 'mozauto' for QA, and changes for x server. r=dustin
Bug 1028104 - tps_ci and mozmill_ci server should have a mozauto builder account. a=org-only
Bug 1029614 - Make screenresolution configurable for specific resolutions. r=dustin
Bug 997721 - Add proxy support for gui applications on OS X. r=dustin