From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 12 Sep 2008 19:31:56 +0000 (+0200)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
X-Git-Url: http://git.samba.org/abartlet/samba.git/?a=commitdiff_plain;h=218a1c8a671ef84614b7b36bbb67ef4b3589c4dc;p=abartlet%2Fsamba.git%2F.git

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit eff27744d3dcb4f6bcdf9bd03583bb38634c398d)
---

218a1c8a671ef84614b7b36bbb67ef4b3589c4dc