| commit | f458b7607618ad3d95568b595065c745c3c69022 | [log] [tgz] |
|---|---|---|
| author | Stephen Smalley <sds@tycho.nsa.gov> | Thu Oct 24 15:24:17 2013 -0400 |
| committer | Stephen Smalley <sds@tycho.nsa.gov> | Thu Oct 24 15:24:17 2013 -0400 |
| tree | 15fb8d39b358e6392684cb17e8840137df2ac99b | |
| parent | 39b5a40295883570a3b43a6be5ddfa9fbced214d [diff] | |
| parent | 50eedb1e1f96a8e36912dc9afe523f8e9c613596 [diff] |
Merge branch 'fedora' into master-merge Conflicts: libselinux/src/Makefile libselinux/src/selinux_config.c policycoreutils/audit2allow/audit2allow.1 policycoreutils/scripts/fixfiles.8 policycoreutils/semanage/semanage.8 policycoreutils/sepolicy/Makefile policycoreutils/sepolicy/sepolicy/transition.py policycoreutils/setsebool/setsebool.8