git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e1554e 162ac70)
Merge remote branch 'martins/eventscripts'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 04:01:13 +0000 (15:01 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 04:01:13 +0000 (15:01 +1100)
(This used to be ctdb commit 8959d15804bb5901356d7beec1ecddb1cabbca52)


Trivial merge
Amitay's Samba development tree