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

author	Guus Sliepen <guus@tinc-vpn.org>
	Sun, 30 Sep 2012 13:00:47 +0000 (15:00 +0200)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Sun, 30 Sep 2012 13:00:47 +0000 (15:00 +0200)
commit	6dfdb323612184529b4b83c1be914dda8262de47
tree	f57efbebbfe65ad7017305502d9d1c808b24f6ec	tree \| snapshot
parent	9e76c464b26b066e1eb3aa5232e573792e28020d	commit \| diff
parent	c4940a5c888d85b4c477b6face5e9a618e64718d	commit \| diff

Merge branch 'master' into 1.1

Conflicts:
lib/utils.c
src/net_setup.c
src/process.c
src/protocol_auth.c
src/protocol_key.c
src/utils.h

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