git.samba.org - bbaumbach/samba-autobuild/.git/commit

author	Jelmer Vernooij <jelmer@samba.org>
	Sat, 11 Oct 2008 01:12:21 +0000 (03:12 +0200)
committer	Jelmer Vernooij <jelmer@samba.org>
	Sat, 11 Oct 2008 01:12:21 +0000 (03:12 +0200)
commit	0fd0fc75c46b39a611c7f9a56081105714d73e36
tree	b93ef5e67e49a3aa49c37e13df3d6222b2df7095	tree
parent	69d38a95c29498c0266cb98b911faa3e7240c787	commit \| diff
parent	47f7ef8f39ba482a7d6578ab82c9e0670381c4f8	commit \| diff

Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest

Conflicts:
selftest/selftest.pl

Unnamed repository; edit this file 'description' to name the repository.