Merge branch 'master' into 1.1

This commit is contained in:
Guus Sliepen 2012-07-14 15:13:21 +02:00
commit 268c8545aa
3 changed files with 15 additions and 4 deletions

1
THANKS
View file

@ -36,6 +36,7 @@ We would like to thank the following people for their contributions to tinc:
* Nick Hibma
* Nick Patavalis
* Paul Littlefield
* Philipp Babel
* Robert van der Meulen
* Rumko
* Scott Lamb