Merge branch 'master' into 1.1

[tinc] / src / getopt.c

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