]> 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: ddaea88 8592752)
Merge branches 'master' and 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorDan Walsh <dwalsh@redhat.com>
Tue, 6 Dec 2011 20:49:14 +0000 (15:49 -0500)
committerDan Walsh <dwalsh@redhat.com>
Tue, 6 Dec 2011 20:49:14 +0000 (15:49 -0500)

Trivial merge
The IPFire selinux policy.