]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/services/denyhosts.te
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'maste...
authorMiroslav Grepl <mgrepl@redhat.com>
Mon, 20 Dec 2010 17:24:18 +0000 (17:24 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Mon, 20 Dec 2010 17:24:18 +0000 (17:24 +0000)
commit2cf9b71d8e3830e2f36fa8423638c1b4c112586c
tree13e4d3966f8ea1b1f578219740c4aa53483f37a9
parent3eecd322ac1d94160db281addc95e3f4f5611592
parent7c4fbeba9482c8d23eb3e85c9261e549e973f365
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/system/init.if
policy/modules/system/init.fc
policy/modules/system/init.if
policy/modules/system/init.te