Fix incorrectly merged bits from 80cd2ff73071941a5356555b85a00ee90dfd0e16.
[tinc] / .gitignore
2012-09-24 Guus SliepenDon't ignore Makefile.am.
2012-09-24 VilbrekinAdd basic .gitignore file, cleaning (most) files genera...