]> 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>
Tue, 3 May 2011 15:27:50 +0000 (11:27 -0400)
committerDan Walsh <dwalsh@redhat.com>
Tue, 3 May 2011 15:27:50 +0000 (11:27 -0400)
1  2 
policy/modules/services/colord.te

Simple merge