]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/services/devicekit.fc
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorDan Walsh <dwalsh@redhat.com>
Thu, 2 Dec 2010 15:53:27 +0000 (10:53 -0500)
committerDan Walsh <dwalsh@redhat.com>
Thu, 2 Dec 2010 15:53:27 +0000 (10:53 -0500)
commitea48be7254706243450147d4cadd2142706306a2
treebc6b1bd6befdeb8482735bf4650f3d2c0ab27d9c
parent060d0f18761654ad1d5dcee4a5e76339a3be881b
parent823ae11e5bca94782b2b10aefc6b2f2dcf811b79
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/services/devicekit.te
policy/modules/services/devicekit.fc
policy/modules/services/devicekit.te