]> 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: f6155fb cc39e25)
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorMiroslav Grepl <mgrepl@redhat.com>
Mon, 19 Dec 2011 09:19:50 +0000 (09:19 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Mon, 19 Dec 2011 09:19:50 +0000 (09:19 +0000)
Conflicts:
policy/modules/system/iscsi.fc


Trivial merge
The IPFire selinux policy.