]> git.ipfire.org Git - people/stevee/selinux-policy.git/commitdiff
projects / people / stevee / selinux-policy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 846da18 c463e14)
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorMiroslav Grepl <mgrepl@redhat.com>
Thu, 24 Mar 2011 00:05:23 +0000 (00:05 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Thu, 24 Mar 2011 00:05:23 +0000 (00:05 +0000)
Conflicts:
policy/modules/roles/unprivuser.te
policy/modules/roles/xguest.te


Trivial merge
The IPFire selinux policy.