Merge default -> production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Bug 933918 - Land android sdk 18 debian code. r=dustin

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merging from default

changeset:   1081:2016c9f384b2
parent:      1079:295f16459944
user:        Dustin J. Mitchell <dustin@mozilla.com>
date:        Wed Oct 30 10:23:48 2013 -0400
summary:     Bug 870661: delete unused file; r=Callek

changeset:   1082:d340a4994244
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Fri Nov 08 08:49:18 2013 -0500
summary:     Bug 870414 - setup scheduler manifests in puppetAgain. r=dustin

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merging from default

changeset:   1087:68cdbe4916e6
tag:         tip
parent:      1085:3b78b01329b4
user:        Rail Aliiev <rail@mozilla.com>
date:        Fri Nov 08 11:12:09 2013 -0500
summary:     Bug 936460 - Run selfserve-agent on multiple masters. r=catlee

--HG--
branch : production
Merge bugs 918932, 922858, and 933918 to production.

--HG--
branch : production
Fix bad syntax.

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merging from default

changeset:   1096:b1a992ffcc4d
tag:         tip
parent:      1094:f405b1ce2536
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Nov 11 16:36:12 2013 -0500
summary:     Bug 870414 - setup scheduler manifests in puppetAgain. r=dustin

--HG--
branch : production
Merge default to production.

changeset:   1098:fc2ecae4cb7a
tag:         tip
parent:      1096:b1a992ffcc4d
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Nov 12 11:23:41 2013 -0500
summary:     Bug 933918 - Deploy patched version of the Android SDK to talos-linux64-ix hosts. r=dustin

--HG--
branch : production
Merge default to production

changeset:   1100:15abecd612c1
tag:         tip
parent:      1098:fc2ecae4cb7a
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Nov 12 11:39:28 2013 -0500
summary:     Backout for bug 933918. r=backout

--HG--
branch : production
changeset:   1102:7878211bd7c3
tag:         tip
parent:      1100:15abecd612c1
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Wed Nov 13 10:29:36 2013 -0500
summary:     Bug 933918 - Deploy newer Android SDK to Ubuntu 64-bit hosts (in-house and EC2). r=dustin

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merge default -> production

--HG--
branch : production
Merging from default

changeset:   1112:5a6b6cbc0714
parent:      1110:1ed95197cebf
user:        Rail Aliiev <rail@mozilla.com>
date:        Mon Nov 18 08:12:25 2013 -0500
summary:     Bug 939541 - puppet-changes emails sometimes have a broken header. r=dustin

changeset:   1113:043150c92101
tag:         tip
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Mon Nov 18 11:32:15 2013 -0500
summary:     bug 939821 - gaia_bumper hgtool timeout. r=catlee

--HG--
branch : production
Merge default -> production

--HG--
branch : production