diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-09-08 12:54:13 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-09-08 12:54:13 +1000 |
| commit | 3eb6f79a02de6820581b91f8d9be80b8dd620119 (patch) | |
| tree | 3567dccbd6e247f72fe079e4592f0084b1ac0059 /source4/scripting/python/misc.py | |
| parent | dadd59ba401943d0cf5e4d07959456b70a3c11d9 (diff) | |
| parent | 1efff73068e933dd0b4cc81ff901f6010fda9a6b (diff) | |
| download | samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.tar.gz samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.tar.bz2 samba-3eb6f79a02de6820581b91f8d9be80b8dd620119.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
(This used to be commit a057c3ed9df2670e5cad5f1807e280d77eb58cb0)
Diffstat (limited to 'source4/scripting/python/misc.py')
| -rw-r--r-- | source4/scripting/python/misc.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py index 933ceef35f..e52d7df11d 100644 --- a/source4/scripting/python/misc.py +++ b/source4/scripting/python/misc.py @@ -118,5 +118,6 @@ def ldb_register_samba_handlers(*args, **kwargs): return _misc.ldb_register_samba_handlers(*args, **kwargs) dsdb_set_ntds_invocation_id = _misc.dsdb_set_ntds_invocation_id private_path = _misc.private_path +unix2nttime = _misc.unix2nttime |