]> 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 Sep 2011 12:15:29 +0000 (12:15 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Mon, 19 Sep 2011 12:15:29 +0000 (12:15 +0000)
commite3128f3ca1c5497a082e824b15691f5e4730bbe9
tree03b70356742051dfc78b8deb4947f376cec61930
parentfc6d1970df4a6a803c86db3c7bbf3fcd451c4e8a
parent94929a9b6e4a6b6778fb404e03a02e70eb19a9c2
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

Conflicts:
policy/modules/system/systemd.if