| commit | 54e32ba846d82a6d444a495d385d7e80bb8ef6d3 | |
| author | Jeremy Allison <jra@samba.org> | |
| Fri, 14 Dec 2007 00:46:42 +0000 (13 16:46 -0800) | ||
| committer | Jeremy Allison <jra@samba.org> | |
| Fri, 14 Dec 2007 00:46:42 +0000 (13 16:46 -0800) | ||
| tree | c3c9651fa5a0312794df60309194a03545ae5ae8 | treesnapshot (tar.gz zip) |
| parent | 9e733924d9119a3a7a8b755557ffe458dda96d63 | commitdiff |
| parent | 0d8146d5de33b4a8fc4b2833fb7e112f440ae365 | commitdiff |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit c9496e97cf91c5f29f19c123377f03f44d1a32f6)
(This used to be commit c9496e97cf91c5f29f19c123377f03f44d1a32f6)