saltstack/salt — pull request #6675 by terminalmage (2013-08-13 17:13:40+00:00)
Title: Fix sphinx build error

When reworking the docstring for the modjk module I introduced a build
error that prevents sphinx from completing the doc build. This commit
resolves that error.