From: Miroslav Grepl Date: Mon, 19 Dec 2011 09:19:50 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy X-Git-Tag: 000~15^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beadd84fa2c60ae5bed9fd5c61c116be839aca8e;p=people%2Fstevee%2Fselinux-policy.git Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy Conflicts: policy/modules/system/iscsi.fc --- beadd84fa2c60ae5bed9fd5c61c116be839aca8e