]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/roles/staff.te
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorMiroslav Grepl <mgrepl@redhat.com>
Mon, 3 Oct 2011 08:35:04 +0000 (08:35 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Mon, 3 Oct 2011 08:35:04 +0000 (08:35 +0000)
commit68891d8d396f0da8571d527d59b962520c45a473
tree50e560d53be2105bef1d7b8dd05909e0d59eb4fa
parent1cbfedefe53b8493320c0d98162fa4ab651c15fe
parente98bdc19e2842a97692f8560081135dea242c08b
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/kernel/corenetwork.te.in
policy/modules/services/postfix.te