commit | 5ba8c79721c8482927c985f9beeca0e52a62d366 | [log] [tgz] |
---|---|---|
author | Stephen Smalley <sds@tycho.nsa.gov> | Mon Dec 09 16:10:24 2013 -0500 |
committer | Stephen Smalley <sds@tycho.nsa.gov> | Mon Dec 09 16:10:24 2013 -0500 |
tree | c0bcc8dfbb054153f8a8e1850a9909bea1371cf7 | |
parent | f89377f24343eb4f10d5c197559447465598f8b1 [diff] | |
parent | 582c2d019926e5a34a637be6ff6eedd93e05f4ca [diff] |
Merge branch 'master' into next Conflicts: policycoreutils/ChangeLog