1
0
mirror of https://github.com/samba-team/samba.git synced 2025-06-12 23:17:06 +03:00
Jelmer Vernooij 1c5e713cce 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 64babbec22f165e34799d36ff4b76806d9fead50)
2008-01-25 11:50:00 +01:00
..
2008-01-24 01:05:57 +01:00