]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorMiroslav Grepl <mgrepl@redhat.com>
Thu, 10 Nov 2011 07:01:58 +0000 (07:01 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Thu, 10 Nov 2011 07:01:58 +0000 (07:01 +0000)
commitb18cc7cd6c276d3db03e1b11dc0206eb95c4a873
tree36c541addc29426bc13ed7350a88efa7e92c645f
parent732e5bc35d39e7911eb7787f69ae326cc0472594
parent911d3ea7092f30905be89f792bb026ea84816758
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/services/vhostmd.te
policy/modules/services/vhostmd.te