From: Benjamin Cama Date: Wed, 1 Feb 2012 23:34:35 +0000 (+0100) Subject: Merge remote-tracking branch 'new-upstream/master' into common-cvs-git-upstream X-Git-Tag: 2.2.1-2fdn3.1~19^2^2~1 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/6b36bc85b235d93d46058c8d7015f61f6bcbc45a?ds=inline;hp=-c Merge remote-tracking branch 'new-upstream/master' into common-cvs-git-upstream Choose the git version when conflicts happen. --- 6b36bc85b235d93d46058c8d7015f61f6bcbc45a