force UTF-8 encoding
Merge pull request #448 from indirect/cred_helper_encoding

force UTF-8 encoding in credential helper
Remove node v0.4 because it fails on 10.9
Merge pull request #455 from boxen/remove-node-0.4

Remove node v0.4 because it fails on 10.9
Node.js v0.4 no longer provided by default

as of 2fc3983825
Merge pull request #457 from celkins/patch-1

Node.js v0.4 no longer provided by default
Add Node 0.10
Merge pull request #460 from pedrogimenez/update-readme

Add Node 0.10
set shebang in gem bins to system ruby
Merge pull request #471 from indirect/master

ensure bootstrap uses system ruby
Short term hack to unbreak boxen-git-credential on 10.8 systems
Merge pull request #475 from seanknox/master

Unbreak boxen-git-credential on 10.8 systems
Merge remote-tracking branch 'boxen/master' into upstream-update

* boxen/master:
  Short term hack to unbreak boxen-git-credential on 10.8 systems
  set shebang in gem bins to system ruby
  Add Node 0.10
  Node.js v0.4 no longer provided by default
  Remove node v0.4 because it fails on 10.9
  force UTF-8 encoding

Conflicts:
	README.md
	manifests/site.pp
Merge pull request #3 from mozilla-boxen/upstream-update

Upstream update
Merge pull request #10 from lonnen/master

how did those commits get there