[selinux-policy: 3165/3172] Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

[Daniel J Walsh]

commit 596d86ad6cae505109cf3fb14222912c39bdb1b4
Merge: 55e9f0e d4d13d2
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Oct 6 09:05:02 2010 -0400

    Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

 policy/modules/admin/vpn.te           |    2 +-
 policy/modules/apps/mediawiki.fc      |   10 ++++++++
 policy/modules/apps/mediawiki.if      |   40 +++++++++++++++++++++++++++++++++
 policy/modules/apps/mediawiki.te      |   35 ++++++++++++++++++++++++++++
 policy/modules/kernel/corecommands.fc |    1 +
 policy/modules/services/apache.te     |    5 ++++
 6 files changed, 92 insertions(+), 1 deletions(-)
---