Merge 3.0 fixes.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 10 Dec 2006 18:57:27 +0000 (19:57 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 10 Dec 2006 18:57:27 +0000 (19:57 +0100)
commit4b349ac3b3fceadf42bf5e19f0373459cbf7e2f3
tree117f17636af24555d0123a41a02a0d3a90868974
parent28302d0d284e871378aab7084aad2da48f8b808c
parentf3421eb0edfca4e8604125faf4e399791cd71127
Merge 3.0 fixes.
Makefile
NEWS
src/ctrlproxy.h
src/linestack_file.c