Merge remote-tracking branch 'origin/master' into cj-make-packages-async

Conflicts:
	package.json
This commit is contained in:
probablycorey 2013-10-16 12:11:35 -07:00
commit 0ee4956109

View File

@ -81,7 +81,7 @@
"to-the-hubs": "0.7.0",
"toml": "0.3.0",
"tree-view": "0.17.0",
"ui-demo": "0.8.0",
"styleguide": "0.8.0",
"whitespace": "0.7.0",
"wrap-guide": "0.4.0",
"c-tmbundle": "1.0.0",