Merge commit 'origin/v4-1-test^' into v4-1-stable
[samba.git] / ctdb /
2012-06-21 Michael AdamAdd current headers from ctdb master.