git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9a1282 eba5fbf)
Merge branch 'ctdb-merge' into dmapi-integration
authorAlexander Bokovoy <ab@samba.org>
Tue, 29 Jan 2008 13:19:21 +0000 (16:19 +0300)
committerAlexander Bokovoy <ab@samba.org>
Tue, 29 Jan 2008 13:19:21 +0000 (16:19 +0300)
(This used to be commit 58dce4cdf277c8c68865185d9d8b4faea996dd3e)


Trivial merge
Samba Shared Repository