r6921: preparing for cherry picking merging
authorStefan Metzmacher <metze@samba.org>
Fri, 20 May 2005 13:52:40 +0000 (13:52 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:16:56 +0000 (13:16 -0500)
commit4541341a1e4305b65068b628db6b0b3a7b9c0150
treecdea8408c77c2e6808f9fc6fc10498f7cf19d50a
parent928d74914318be9a223037f25d9c0394e39e4b7e
r6921: preparing for cherry picking merging
(This used to be commit a7c915be3e427a6d05a4c85a5bab17217e704125)
source4/script/mkversion.sh-merge-12328 [new file with mode: 0755]