Merge branch 'master' of ssh://git.samba.org/data/git/samba into wsgi
authorJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 18:08:00 +0000 (20:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 18:08:00 +0000 (20:08 +0200)
commit69577aa34b23ea2573bcea901586719f2fe14826
treeefa5ed9cf825dae4332b160c7f2e7f1824468f5e
parentbbfce1b43d183cdccbe6f9a189098091f9d4a251
parent7e5f345cfe2f553bca65deccb4b47f19f9208a5b
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wsgi