]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into 3-3-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 17 Jun 2008 12:46:34 +0000 (22:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 17 Jun 2008 12:46:34 +0000 (22:46 +1000)

Trivial merge