commit | f89377f24343eb4f10d5c197559447465598f8b1 | [log] [tgz] |
---|---|---|
author | Stephen Smalley <sds@tycho.nsa.gov> | Tue Nov 26 14:07:49 2013 -0500 |
committer | Stephen Smalley <sds@tycho.nsa.gov> | Tue Nov 26 14:07:49 2013 -0500 |
tree | a61d1bc591d225d25087cfacd0b649a895f250ee | |
parent | 8d2dc72445971b0a6a7566f372fe7fcb557ca6f1 [diff] | |
parent | 1bca9b596433395fc9dd33c36b4c61122840ca98 [diff] |
Merge branch 'master' into next Conflicts: policycoreutils/ChangeLog