| commit | fd66cc5534ffb8fbdd071b2c453744562a16e818 | [log] [tgz] |
|---|---|---|
| author | Andrew Kuchling <amk@amk.ca> | Fri Nov 22 20:18:26 2013 -0500 |
| committer | Andrew Kuchling <amk@amk.ca> | Fri Nov 22 20:18:26 2013 -0500 |
| tree | e6e8c41367e23df02fa2867605eb9523eef73208 | |
| parent | 9c1aed8f94a2b7a40c3a4db60cb289c90e001896 [diff] | |
| parent | f92ef9be46ad7a1ca7fc177074892e6486e8b35f [diff] |
Merge from 3.3
diff --git a/Misc/ACKS b/Misc/ACKS index 8c89f16..9436af8 100644 --- a/Misc/ACKS +++ b/Misc/ACKS
@@ -1186,7 +1186,6 @@ Michael Shiplett John W. Shipman Joel Shprentz -Itamar Shtull-Trauring Yue Shuaijie Terrel Shumway Eric Siegerman @@ -1316,6 +1315,7 @@ Erno Tukia David Turner Stephen Turner +Itamar Turner-Trauring Theodore Turocy Bill Tutt Fraser Tweedale