]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorDan Walsh <dwalsh@redhat.com>
Mon, 20 Dec 2010 16:57:08 +0000 (11:57 -0500)
committerDan Walsh <dwalsh@redhat.com>
Mon, 20 Dec 2010 16:57:08 +0000 (11:57 -0500)
commita0181cbf6a6cf3d765aa2b59c8f250f7ede053ef
treef24f8fd9fba67098aced2e6aaa92799e6b9bfcc3
parent4eea2889dd80bd7b5812336fa71bce4b4f0e1596
parent2cf9b71d8e3830e2f36fa8423638c1b4c112586c
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

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