more followup
more followup
Merge branch 'restdoc-content' of https://github.com/sathomas/Hilary into restdoc

Conflicts:
	node_modules/oae-content/lib/rest.js