Colton Myers f625c21d77 Merge branch '2014.7' into mergeforward ... Conflicts: salt/cloud/clouds/ec2.py salt/daemons/flo/worker.flo salt/master.py salt/minion.py salt/modules/lxc.py salt/states/win_update.py salt/states/zk_concurrency.py		2014-10-30 17:42:36 -06:00
..
css	Add a fix for long lines. Fixes #13724	2014-06-25 12:57:09 -07:00
images	Swap out SaltConf15 sidebar image for one with better scaled fonts	2014-10-22 16:26:26 -06:00
img	Update with proper perms	2014-03-23 18:05:05 +00:00
js	Spelling fixes for docs	2014-10-28 08:12:27 -07:00