git.samba.org / obnox / samba / samba-obnox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db99f98 4626665)
fix conflict in merge from metze
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 16 Dec 2009 07:34:40 +0000 (18:34 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 16 Dec 2009 07:34:40 +0000 (18:34 +1100)
Merge commit 'metze/master-tdb-check'

Conflicts:

server/ctdb_vacuum.c

(This used to be ctdb commit 82421f20dcad4b0e25f109583879a26c0ee9c465)


Trivial merge
Michael's Samba GIT