Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange | Jelmer Vernooij | 2008-04-04 | 1 | -0/+9 |
Conflicts: source/headermap.txt (This used to be commit 1b084e85c1f5963d924f7764ae751f8cd8e57364) |