David Glasser 3b21c2d9a7 Merge branch 'devel' into publish-packages ...

Conflicts:
	packages/domutils/package.js
	packages/handlebars/package.js
	packages/htmljs/package.js
	packages/liverange/package.js
	packages/madewith/package.js
	packages/meteor-developer/meteor_developer_server.js
	packages/preserve-inputs/package.js
	packages/spark/package.js
	packages/universal-events/package.js
	tools/commands.js
	tools/files.js
	tools/help.txt
	tools/packages.js

2014-04-24 16:27:21 -07:00

..

.gitignore

More fixes, from the merge of devel into linker.

2013-05-28 15:52:50 -07:00

google_client.js

Merge remote-tracking branch 'origin/devel' into awwx-oauth-encryption

2014-04-22 11:31:31 -07:00

google_configure.html

Merge branch 'devel' into shark

2014-03-06 16:21:33 -08:00

google_configure.js

Extract google package from accounts-google

2013-05-17 18:00:35 -07:00

google_server.js

Merge remote-tracking branch 'origin/devel' into awwx-oauth-encryption

2014-04-22 11:31:31 -07:00

package.js

Revert "Meteor.loginWith<External> now waits for config"

2014-04-21 13:39:36 -07:00