git.samba.org / vlendec / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dce5969 835e0b6)
Merge remote branch 'martins/ganesha'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 17 May 2012 01:48:07 +0000 (11:48 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 17 May 2012 01:48:07 +0000 (11:48 +1000)
(This used to be ctdb commit f23b5a160184db8c92f8c69307dc4a64adae839d)


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