git.samba.org / sfrench / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a4f7e4 539f044)
Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Thu, 4 Dec 2008 03:42:04 +0000 (14:42 +1100)
committerMartin Schwenke <martin@meltin.net>
Thu, 4 Dec 2008 03:42:04 +0000 (14:42 +1100)
(This used to be ctdb commit 4ff5875c965f21ab76a5924efd92f1832aeb36d4)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.