bug 994267: remove machines that don't exist from buildbot-configs. r=rail
revert Bug 992969 - Move Android 2.3 reftests to ix slaves (ash only) r=Callek
Merging from default

changeset:   10171:c6f2b9d61d0e
parent:      10169:bacd72317bae
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Apr 10 11:10:54 2014 -0400
summary:     bug 994267: remove machines that don't exist from buildbot-configs. r=rail

changeset:   10172:bfe6dbd28581
tag:         tip
user:        kmoir@mozilla.com
date:        Thu Apr 10 11:22:07 2014 -0400
summary:     revert Bug 992969 - Move Android 2.3 reftests to ix slaves (ash only) r=Callek

--HG--
branch : production