Jeff Hutchins 63393e98ef Merge branch '0.9.8' of git://github.com/saltstack/salt into networkstate ... Conflicts: doc/ref/modules/all/index.rst		2012-04-03 10:25:30 -06:00
..
all	Merge branch '0.9.8' of git://github.com/saltstack/salt into networkstate	2012-04-03 10:25:30 -06:00
index.rst	add sentence pointing to _modules dir for custom modules	2012-03-17 21:50:16 -04:00