| commit | b3f3eb1bc551b8bc9698257cf1b3abc7442dd41b | |
| author | Alexander Bokovoy <ab@samba.org> | |
| Wed, 16 Jan 2008 09:57:15 +0000 (16 12:57 +0300) | ||
| committer | Alexander Bokovoy <ab@samba.org> | |
| Wed, 16 Jan 2008 09:57:15 +0000 (16 12:57 +0300) | ||
| tree | 6b8887ca9a27a0f961b0b0ce554eabe8497a4ab8 | treesnapshot (tar.gz zip) |
| parent | 1e0abd97f9f6919ca338ee696d35064efd0f8774 | commitdiff |
| parent | b9d21dd668d3032643bf8d465d7b988de2d2f49a | commitdiff |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge
(This used to be commit 17b2bea7093681a4c4119f9fe7104c018fd0af6f)
(This used to be commit 17b2bea7093681a4c4119f9fe7104c018fd0af6f)