| commit | c8a18807d5988ec2ff4fe3422397cca41771ba5a | [log] [tgz] |
|---|---|---|
| author | Joshua Brindle <method@manicmethod.com> | Mon Jan 12 10:53:11 2009 -0500 |
| committer | Joshua Brindle <method@manicmethod.com> | Mon Jan 12 10:53:11 2009 -0500 |
| tree | c3f9c575fae7064b9c9d091ad2331b18d63c5434 | |
| parent | a5dfb3abe007a76ea5119e6cf57802f8b8a0fd43 [diff] | |
| parent | 7817c92986edf432268f794a80cd52efb9f8b858 [diff] |
Merge branch 'master' of jbrindle@oss.tresys.com:/home/git/selinux Conflicts: libselinux/ChangeLog