Merge branch 'master' into 1.1

[tinc] / src / dropin.c

diff --git a/lib/dropin.c b/src/dropin.c
similarity index 100%
rename from lib/dropin.c
rename to src/dropin.c