git.samba.org / jra / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eab4ab 37325c4)
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jan 2008 04:09:55 +0000 (15:09 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jan 2008 04:09:55 +0000 (15:09 +1100)
(This used to be commit f82eec69f1846aa46e4afe595d956cfd2256c335)


Trivial merge
Experimental branches for jra