git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e80a5ab 25f3c8b)
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)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>

Trivial merge
Samba Shared Repository