diff options
| author | Simo Sorce <idra@samba.org> | 2007-12-17 09:43:18 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2007-12-17 09:43:18 -0500 |
| commit | d20608c8f314476ca7dde8a9a61495431b4bccff (patch) | |
| tree | 353570247ae5e32d936a8519c36004466f464a14 /source3/VERSION | |
| parent | 9f5a16a22da812ed58dcb46979ab5ae27d3a905e (diff) | |
| download | samba-d20608c8f314476ca7dde8a9a61495431b4bccff.tar.gz samba-d20608c8f314476ca7dde8a9a61495431b4bccff.tar.bz2 samba-d20608c8f314476ca7dde8a9a61495431b4bccff.zip | |
Merge in J.Layton patch and resolve conflict.
(This used to be commit 6b1a118eaaab405eeef0cf3c0488a2747af562ba)
Diffstat (limited to 'source3/VERSION')
0 files changed, 0 insertions, 0 deletions