ajacoutot 791254db5d Merge from upstream: ... Return pillar data if not external pillar data.		2014-10-01 13:48:48 +00:00
..
files	Don't use _formatfor().	2014-09-12 07:16:05 +00:00
patches	Merge from upstream:	2014-10-01 13:48:48 +00:00
pkg	Seems that the egg-info file now always installs with the proper version.	2014-09-03 09:11:19 +00:00
distinfo	Update to salt-2014.1.11.	2014-09-10 06:08:42 +00:00
Makefile	Merge from upstream:	2014-10-01 13:48:48 +00:00