Merge branch '4-0-local' into v4-0-stable save-diskspace-tags/samba-4.0.0alpha5
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 09:34:11 +0000 (19:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 09:34:11 +0000 (19:34 +1000)
commitdc238848b3987a187212bd8088916c5b34755b0f
tree3781f2d67933e65b5b254e95c5e388776885cd5a
parent0d9cc2d5333a0f8eb4f92b47a664f979f0ea6bdd
parent6459adb6ac2bf94a1e60c1450dbef43360f30888
Merge branch '4-0-local' into v4-0-stable