saltstack/salt — pull request #6579 by terminalmage (2013-08-08 20:17:19+00:00)
Title: Fix traceback on master when cp.push is used without file_recv being set

Additionally, this pull req corrects a docstring, adds some missing master config file params to the the online documentation, and adds ``file_recv`` to the master config file template.