]> 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>
Mon, 19 Dec 2011 09:19:50 +0000 (09:19 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Mon, 19 Dec 2011 09:19:50 +0000 (09:19 +0000)
commitbeadd84fa2c60ae5bed9fd5c61c116be839aca8e
tree566ab4fc4344c9c4a308e577ffba5dd3e6b16490
parentf6155fb6c262b7a9463013357b3959c6eb1e40b5
parentcc39e254e6d0493fa3d74a6a74c02f2410bf60c6
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/system/iscsi.fc