diff options
author | Bryn M. Reeves <bmr@redhat.com> | 2013-04-23 17:41:07 +0100 |
---|---|---|
committer | Bryn M. Reeves <bmr@redhat.com> | 2013-04-23 17:41:07 +0100 |
commit | b6c4be32b8fa25d1897009c53398fd92f8b6b1ab (patch) | |
tree | 1affdf72c758d4b8e77cf3415bde8e8566aaf245 /po/Makefile | |
parent | 8148daf9914ece62a8e5fb62f45d6470661773a7 (diff) | |
parent | ee7f5229a07f1f506b3cf2cc82e1854cec5aba74 (diff) | |
download | sos-b6c4be32b8fa25d1897009c53398fd92f8b6b1ab.tar.gz |
Merge branch 'new_ldap' of https://github.com/karibou/sosreport
Conflicts:
sos/plugins/ldap.py
Diffstat (limited to 'po/Makefile')
0 files changed, 0 insertions, 0 deletions