Merge branch 'delete-broken-search-code'

Conflicts:
	readthedocs/core/static/core/js/readthedocs-doc-embed.js
build-pdf-ret-val
Eric Holscher 2015-07-27 22:45:03 -07:00
commit b9a2542e91

Diff Content Not Available