git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 446b40b 08ebcf6)
Merge remote branch 'martins/scriptstatus'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:46:45 +0000 (14:46 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:46:45 +0000 (14:46 +1100)
(This used to be ctdb commit c4ff223096e7dae2e67692825a78c520d30211e0)


Trivial merge
Samba Shared Repository