]> 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>
Sat, 1 Oct 2011 10:17:46 +0000 (06:17 -0400)
committerDan Walsh <dwalsh@redhat.com>
Sat, 1 Oct 2011 10:17:46 +0000 (06:17 -0400)
commitb3ca8e06a8ea1ca998ce24faad15d3cbd59111e8
treeaf80827b21f25793c1b694d491c4a58a95597329
parent4ec3fa731a6ddd718e6e45044d745309b89333c1
parentb8712040ccae750618cd83a60ec344cca4e555e8
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/apps/thumb.te
policy/modules/apps/thumb.te
policy/modules/services/dbus.if