Jack Kuan cf7f7faba9 Merge branch 'develop' of github.com:saltstack/salt into develop ... Conflicts: salt/renderers/jinja.py salt/renderers/json.py salt/renderers/mako.py salt/renderers/wempy.py		2012-11-15 01:29:34 -05:00
..
all	Updated docs for new pipelined renderers	2012-11-14 12:41:52 -07:00
index.rst	Doc updates, typo fixes. Add -s option for template renderers.	2012-11-15 01:20:10 -05:00