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
..
static	Merge branch '2014.7' into mergeforward	2014-10-30 17:42:36 -06:00
layout.html	Fixed css fonts:	2014-06-17 13:39:31 -07:00
theme.conf	Updated docs with new design	2013-02-26 12:22:03 -07:00