Emily Stark 71652f9b9f Merge branch 'master' into devel ...

Conflicts:
	History.md
	docs/client/data.js
	docs/client/full-api/concepts.html
	docs/client/full-api/tableOfContents.js
	examples/localmarket/.meteor/packages
	packages/ddp/package.js
	packages/meteor-tool/package.js
	packages/mongo/package.js
	scripts/admin/manifest.json

2014-12-09 13:15:29 -08:00

..

.meteor

Merge branch 'master' into devel

2014-12-09 13:15:29 -08:00

client

Clock example uses old API

2014-11-14 13:56:08 +03:00