diff options
| author | Simo Sorce <ssorce@redhat.com> | 2007-09-20 16:58:54 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2007-09-20 16:58:54 -0400 |
| commit | fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8 (patch) | |
| tree | c7ef1ebd964eb6c5fc42e681c5527b514338ae60 /ipa-python/user.py | |
| parent | b85668579ec3fc69c2ed709533f8bd8d00e0e7e9 (diff) | |
| parent | 4e79c37c604f0e51dab19fc28063b3186df0c6d9 (diff) | |
| download | freeipa.git-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.tar.gz freeipa.git-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.tar.xz freeipa.git-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.zip | |
Merge conflicts between rob and kevin patches
Diffstat (limited to 'ipa-python/user.py')
0 files changed, 0 insertions, 0 deletions