projects / l2tpns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e57e8c3 b939b00)
Merge remote-tracking branch 'new-upstream/master' into common-cvs-git-upstream
authorBenjamin Cama <benoar@dolka.fr>
Wed, 1 Feb 2012 23:34:35 +0000 (00:34 +0100)
committerBenjamin Cama <benoar@dolka.fr>
Wed, 1 Feb 2012 23:34:35 +0000 (00:34 +0100)
Choose the git version when conflicts happen.


Trivial merge
for cloning use: "git clone git://git.sameswireless.fr/l2tpns.git" ; For add to your sources.list: "deb http://package.sameswifi.fr/ jessie main"