Pedro Algarvio 0b946ba32b Merge branch '2014.7' into hotfix/merge-forward		2014-11-22 02:17:10 +00:00
..
index.rst	Fixing sphinx violations and errors	2014-11-18 02:53:40 -05:00
master_events.rst	Add information about salt-cloud events to master events doc	2014-11-21 15:57:59 -07:00