Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2012-02-10 22:18:19 -05:00
commit c5b6e46488

2
README
View File

@ -72,7 +72,6 @@ The following people have helped with suggestions, ideas, code or
fixing bugs: fixing bugs:
Arno Bakker Arno Bakker
Maseeb Abdul
Alejo Alejo
Weston Andros Adamson Weston Andros Adamson
William Ahern William Ahern
@ -160,6 +159,7 @@ fixing bugs:
Robert Ransom Robert Ransom
Bert JW Regeer Bert JW Regeer
Peter Rosin Peter Rosin
Maseeb Abdul Qadir
Wang Qin Wang Qin
Hanna Schroeter Hanna Schroeter
Ralf Schmitt Ralf Schmitt