Bug 926607 - add disabled category to mach bootstrap, r=jgriffin
Merge pull request #287 from ahal/disabled_category

Bug 926607 - add disabled category to mach bootstrap, r=jgriffin
Bug 924697. Modifies profile.sh to take arguments to start profiler
Bug 912756 - Remove redundant Marionette script, r=ahal
Merge pull request #290 from changm/bug924697

Bug 924697. Modifies profile.sh to take arguments to start profiler. r=benwa, jld
Bug 931718 - Append 'xulrunner-sdk' to XRE Path

With bug 906316 we are now able to have multiple versions of the SDKs on
disk, to avoid always re-downloading them. Path has changed, and we need
to append 'xulrunner-sdk' so that the binary can be used.
Merge pull request #292 from lissyx/bug931718

Bug 931718 - Append 'xulrunner-sdk' to XRE Path r=ahal
Revert "Merge pull request #292 from lissyx/bug931718"

This reverts commit 895fd4ce2b7a48292c3c122b5e2d5bfc55a48928, reversing
changes made to 16cdd8699b58c1c16889b6362404988bbda45a3f.
Merge pull request #293 from lissyx/revert-bug931718

Revert "Merge pull request #292 from lissyx/bug931718"
Bug 931878 - Fix test.sh xpcshell, r=ahal