bug 1003361 - update b2g_tag.py for june 9 merge day. r=rail
Bug 1021817 - Move StructuredOutputParser into mozharness proper, r=aki

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

changeset:   2833:c5738f6ef014
parent:      2830:b2299704c3d2
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Mon Jun 09 19:07:01 2014 -0700
summary:     bug 1003361 - update b2g_tag.py for june 9 merge day. r=rail

changeset:   2835:d76156e83a22
parent:      2833:c5738f6ef014
user:        James Graham <james@hoppipolla.co.uk>
date:        Tue Jun 10 18:13:33 2014 +0100
summary:     Bug 1021817 - Move StructuredOutputParser into mozharness proper, r=aki

--HG--
branch : production