git.librecmc.org Git - oweals/tinc.git/commit

author	Guus Sliepen <guus@tinc-vpn.org>
	Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
commit	79e46d08a46f2fef2ee4e8eac7ba487007160564
tree	93ee6e8e0eab1b47ddc5a4ef80d54c67765ca6f5	tree \| snapshot
parent	4ce4af4c712c80d08630767ec34787253da1021b	commit \| diff
parent	4766359e1426bdf1383c898d6103d8760e5e296d	commit \| diff

Merge branch 'master' into 1.1

Conflicts:
NEWS
README
configure.in
src/net.c
src/net.h

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.