Colton Myers 932aa97e1f Merge branch '2014.7' into develop		2014-08-15 16:33:02 -06:00
..
index.rst	Updated the troubleshooting index with some link fixes for 12791.	2014-05-21 02:42:12 +00:00
master.rst	Fix a typo in the master conf.	2014-08-13 11:09:05 -07:00
minion.rst	Fix a typo	2014-08-13 11:08:35 -07:00
yaml_idiosyncrasies.rst	No second person	2014-08-13 17:33:06 -06:00