]> git.ipfire.org Git - people/stevee/selinux-policy.git/commitdiff
Merge branches 'master' and 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorDan Walsh <dwalsh@redhat.com>
Fri, 5 Aug 2011 12:51:51 +0000 (08:51 -0400)
committerDan Walsh <dwalsh@redhat.com>
Fri, 5 Aug 2011 12:51:51 +0000 (08:51 -0400)

Trivial merge