Merge branch 'master' of https://git.erp5.org/repos/re6stnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 14 Aug 2012 03:24:32 +0000 (05:24 +0200)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 14 Aug 2012 03:24:32 +0000 (05:24 +0200)
commit3b4883a84c6b6214bbb612e5c9dd70393adb7f05
tree19c3284c6ab2ab50547c99c7eaec826a7082ec09
parent3ccc14d31c09fd69e5c6955c09ec0800faf86a51
parent84127aa6f4b39106ae41f67395923008215b521b
Merge branch 'master' of https://git.erp5.org/repos/re6stnet

Conflicts:
re6st/tunnel.py

Re6stnet now create a socket and listen on it. The socket is not used yet
re6st/db.py
re6st/ovpn-server
re6st/plib.py
re6st/tunnel.py
re6stnet