Bug 920219 - Display content of .userconfig r=ahal
Merge pull request #300 from s-dehaan/bug920219

Bug 920219 - Display content of .userconfig
Bug 943160 - pass '-j' option to repo via config.sh
Update config.sh

Changes done as per feedback
Bug 942219 - Wrong homebrew url in bootstrap-mac.sh
Merge pull request #301 from pchangbin/master

Bug 943160 - pass '-j' option to repo via config.sh, r=jld
Add support to Fugu device
Merge pull request #302 from petemoore/master

Bug 942219 - Wrong homebrew url in bootstrap-mac.sh
Bug 948463 - Add support for entry points to mach bootstrap, r=jgriffin
Merge branch 'master' of github.com:mozilla-b2g/B2G

Conflicts:
	tools/mach_b2g_bootstrap.py