git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56b178e f23b82b)
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Fri, 5 Feb 2010 03:00:23 +0000 (14:00 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 5 Feb 2010 03:00:23 +0000 (14:00 +1100)
(This used to be ctdb commit a442668923d4d8f8d624e00138fe37d76d593d21)


Trivial merge
Samba Shared Repository