David Glasser 1ec9b1da71 Merge branch 'devel' into shark ...

"templating - template arg" fails before and after this merge

Conflicts:
	packages/handlebars/.npm/package/npm-shrinkwrap.json
	packages/handlebars/package.js
           (semi-updating handlebars to shrink package size, vs deleting)

	packages/minifiers/package.js
           (two different new tests)

	packages/minimongo/minimongo.js
           (observe moved to a new file)

2013-12-13 10:05:55 -08:00

..

.meteor

use galaxy-follower-6 release on docs

2013-11-04 15:15:19 -08:00

client

Merge branch 'devel' into shark

2013-12-13 10:05:55 -08:00

lib

docs to 0.6.6.3

2013-11-04 12:14:21 -08:00

public

Depends on PR 685 (the appcache package).

2013-02-21 18:41:53 -08:00