1
0
mirror of https://github.com/samba-team/samba.git synced 2025-06-19 23:17:05 +03:00
Jelmer Vernooij c8011b5d09 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:

	source/scripting/python/config.mk
(This used to be commit 0ac0ea660ab63eca764149f1d2828d0238a57289)
2008-02-29 12:45:46 +01:00
..
2008-02-12 22:10:25 +01:00
2008-02-20 11:32:56 +01:00
2008-02-28 20:04:58 +01:00