Emily Stark 399629e941 Merge branch 'release-0.8.1.1' ...

The large number of conflicts is because release-0.8.1.1 was branched
off of release/0.8.1 instead of master.

Conflicts:
	History.md
	docs/.meteor/release
	docs/lib/release-override.js
	examples/clock/.meteor/release
	examples/leaderboard/.meteor/release
	examples/parties/.meteor/release
	examples/todos/.meteor/release
	examples/wordplay/.meteor/release
	scripts/admin/banner.txt
	scripts/admin/notices.json

2014-05-01 12:37:41 -07:00

..

admin

Merge branch 'release-0.8.1.1'

2014-05-01 12:37:41 -07:00

generate-dev-bundle.sh

Upgrade Node.js from 0.10.25 to 0.10.26

2014-04-07 22:56:41 -07:00

node.sh

use meteor --get-ready instead of --version in places where we're trying to make

2013-03-29 11:52:33 -07:00