Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-wsgi v4-0-wsgi
authorJelmer Vernooij <jelmer@samba.org>
Mon, 26 May 2008 12:18:03 +0000 (14:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 26 May 2008 12:18:03 +0000 (14:18 +0200)
commitca95733e6ed35c5c9eb87e3f6212c1ae08d6a894
tree0070f45f09886e3e20c39af62a21d0e6c70b665a
parentc2fef5bd6d598bffc328ddc037fffe1a11704468
parentda3094d1ba86a8f4967ca1993383b0767439f79f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-wsgi