1
0
mirror of https://github.com/samba-team/samba.git synced 2025-04-29 14:50:26 +03:00
Jelmer Vernooij f47093baf0 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:

	source/scripting/python/samba/provision.py
(This used to be commit e367df5d994181f08ad1a20a0ce01991ca30bcc8)
2008-02-08 14:02:22 +01:00
..