Date: Wed Jun 16 11:49:43 2004 Author: kaber Update of /cvsroot/patch-o-matic-ng/conntrack_memsave In directory coruscant.gnumonks.org:/tmp/cvs-serv1712 Modified Files: info Log Message: Add conflicts Revisions: info 1.2 => 1.3 http://cvs.netfilter.org/patch-o-matic-ng/conntrack_memsave/info?r1=1.2&r2=1.3