| commit | 258ae4cec596631b758fb17c170c4494e4db8a8e | |
| author | Jelmer Vernooij <jelmer@samba.org> | |
| Wed, 25 Feb 2009 11:49:37 +0000 (25 12:49 +0100) | ||
| committer | Jelmer Vernooij <jelmer@samba.org> | |
| Wed, 25 Feb 2009 11:49:37 +0000 (25 12:49 +0100) | ||
| tree | 5c9ef9246eef3af3b744e862d0e5314a4686304e | treesnapshot (tar.gz zip) |
| parent | fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf | commitdiff |
| parent | a041d9061922b1a90e5b5047af77934d908afdd5 | commitdiff |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
source4/scripting/python/samba/provision.py
Conflicts:
source4/scripting/python/samba/provision.py
| source4/scripting/python/samba/provision.py | diff1 | diff2 | blobhistory |