]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:25:08 +0000 (14:25 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:25:08 +0000 (14:25 +0100)

Trivial merge