git.samba.org / kai / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1279811 d5fd4fc)
Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 21 Oct 2009 10:48:15 +0000 (21:48 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 21 Oct 2009 10:48:15 +0000 (21:48 +1100)
(This used to be ctdb commit 61282d4a9be9e544aaa86f3cffc5b58e417f5ab1)


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