diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2010-12-06 17:02:02 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2010-12-06 17:02:02 -0500 |
| commit | 3ea0e361a223eec4633e985ddbfd5e4b072bd4a5 (patch) | |
| tree | 9004d2c69d7ef9b078c0a267ea9ec6b587df5389 | |
| parent | 695c21dd421d99cfbbb90e1a2c3c92ab01d6f8e0 (diff) | |
| parent | ee3bb042af587af5b4adfce84ce0ebd81fb02c7d (diff) | |
Merge branch 'master-f15-1.9' of ssh://pkgs.fedoraproject.org/krb5 into master-f15-1.9
Conflicts:
krb5.spec
sources
0 files changed, 0 insertions, 0 deletions