]> git.ipfire.org Git - people/stevee/selinux-policy.git/commitdiff
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)
Conflicts:
policy/modules/system/init.if

1  2 
policy/modules/system/init.if

Simple merge