James Fryman 721fb2f79f Merge branch 'master' of github.com:jfryman/puppet-nginx ... Conflicts: manifests/package/redhat.pp		2012-08-28 14:36:40 -05:00
..
debian.pp	Style compliance	2011-06-15 14:43:01 -07:00
redhat.pp	Merge branch 'master' of github.com:jfryman/puppet-nginx	2012-08-28 14:36:40 -05:00
suse.pp	Style compliance	2011-06-15 14:43:01 -07:00