Merge branch 'master' of ctdb into 'master' of samba
authorStefan Metzmacher <metze@samba.org>
Wed, 13 Nov 2013 13:17:32 +0000 (14:17 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 13 Nov 2013 13:18:52 +0000 (14:18 +0100)
commitf087a8e2b81fae82fa571ef09d2d1cb682cc8ff8
treed4a6b14a1594958150b733180d995b5c32025017
parente80a5aba3db8e81173fa443991e08ef4a300ea5c
parent25f3c8b5269863aadbe72e304da7012782ef5b25
Merge branch 'master' of ctdb into 'master' of samba

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>