Jelmer Vernooij 258ae4cec5 Merge branch 'master' of ssh://git.samba.org/data/git/samba ... Conflicts: source4/scripting/python/samba/provision.py		2009-02-25 12:49:37 +01:00
..
bin	Remove use of global_loadparm in last Python script.	2008-10-24 15:45:13 +02:00
python	Merge branch 'master' of ssh://git.samba.org/data/git/samba	2009-02-25 12:49:37 +01:00