| commit | a390bcf9403df4cf4d5eef42b35ebccbe253882e | |
| author | Karolin Seeger <kseeger@samba.org> | |
| Fri, 29 Feb 2008 09:44:38 +0000 (29 10:44 +0100) | ||
| committer | Karolin Seeger <kseeger@samba.org> | |
| Fri, 29 Feb 2008 09:44:38 +0000 (29 10:44 +0100) | ||
| tree | 4d2e09ac4fddef7c88e44a01dd9b825c1a3ffbd5 | treesnapshot (tar.gz zip) |
| parent | 6993b6139419761c649f3ad54467a2c34f29382d | commitdiff |
| parent | 364d87a5e41045808ebd28f46c5c0c93bd13a7da | commitdiff |
Merge commit 'origin/v3-2-test' into v3-2-stable
Conflicts:
WHATSNEW.txt
Conflicts:
WHATSNEW.txt
| WHATSNEW.txt | diff1 | diff2 | blobhistory |