Pedro Algarvio 733b31da23 Merge branch '2014.7' into develop ... Conflicts: tests/unit/modules/hashutil_test.py tests/unit/templates/jinja_test.py		2014-11-27 03:59:40 +00:00
..
conf	catch exceptions and fix some vars	2014-08-05 22:39:57 -04:00
var	Add Windows Installer Package resources.	2013-01-04 08:57:30 -07:00
nssm.exe	Switch nssm back to 32-bit	2014-11-26 13:35:53 -07:00
salt.ico	Add Windows Installer Package resources.	2013-01-04 08:57:30 -07:00