]> git.ipfire.org Git - people/stevee/selinux-policy.git/commitdiff
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorMiroslav Grepl <mgrepl@redhat.com>
Tue, 29 Nov 2011 10:34:51 +0000 (11:34 +0100)
committerMiroslav Grepl <mgrepl@redhat.com>
Tue, 29 Nov 2011 10:34:51 +0000 (11:34 +0100)
1  2 
policy/modules/services/colord.te

Simple merge