git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 309473f ca84795)
Merge branch 'master' of git://git.samba.org/samba
authorNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Wed, 13 Jan 2010 10:02:31 +0000 (12:02 +0200)
committerNadezhda Ivanova <nadezhda.ivanova@postpath.com>
Wed, 13 Jan 2010 10:02:31 +0000 (12:02 +0200)

Trivial merge
Amitay's Samba development tree