bug 1000221: add support for "isOSUpdate" attribute - set isOSUpdate for FOTAs. r=aki
Bug 1018887 - Ensure that web-platform-tests emit tbpl-compatible output when tests fail, r=aki

--HG--
extra : rebase_source : 184b94ab6ccd5632734f74a45fd95232c6560ec5
Bug 1011207 - cancelled 2.3 mochitest jobs put ix slaves into weird state (and so need rebooting) r=aki
Bug 920569 - Add missing . in EXE_SUFFIX, r=armenzg
bug 1019170: no new hamachi/helix/nexus-4 updates since may 30th - revert update channel logic for old style updates. r=nthomas
bug 987980 - merge day b2g l10n vcs-sync configs. r=hwine

--HG--
extra : rebase_source : cca045519dced5cf6eec82c40b0aa86e302cb271
Merging from default

changeset:   2808:04f9a92db3ff
parent:      2806:e9bc9209ac0a
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Mon Jun 02 09:52:22 2014 -0400
summary:     bug 1000221: add support for "isOSUpdate" attribute - set isOSUpdate for FOTAs. r=aki

changeset:   2809:f33d4a5eafc4
user:        James Graham <james@hoppipolla.co.uk>
date:        Mon Jun 02 17:46:40 2014 +0100
summary:     Bug 1018887 - Ensure that web-platform-tests emit tbpl-compatible output when tests fail, r=aki

changeset:   2810:aefb4b1b908f
user:        kmoir@mozilla.com
date:        Mon Jun 02 14:29:43 2014 -0400
summary:     Bug 1011207 - cancelled 2.3 mochitest jobs put ix slaves into weird state (and so need rebooting) r=aki

changeset:   2811:636bceab7560
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Fri May 30 15:07:48 2014 -0700
summary:     Bug 920569 - Add missing . in EXE_SUFFIX, r=armenzg

changeset:   2812:566ef79ed95b
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Mon Jun 02 17:10:27 2014 -0400
summary:     bug 1019170: no new hamachi/helix/nexus-4 updates since may 30th - revert update channel logic for old style updates. r=nthomas

changeset:   2815:ed19201ed0fb
tag:         tip
parent:      2812:566ef79ed95b
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Mon Jun 02 20:27:41 2014 -0700
summary:     bug 987980 - merge day b2g l10n vcs-sync configs. r=hwine

--HG--
branch : production