Merge branch 'master' into 1.1

This commit is contained in:
Guus Sliepen 2012-07-27 22:48:24 +02:00
commit 248d300f1b
3 changed files with 3 additions and 2 deletions

1
THANKS
View file

@ -31,6 +31,7 @@ We would like to thank the following people for their contributions to tinc:
* Matias Carrasco
* Max Rijevski
* Menno Smits
* Mesar Hameed
* Michael Tokarev
* Miles Nordin
* Nick Hibma