Merge from 3.3

fd66cc55 · Andrew Kuchling · 9c1aed8f · f92ef9be · fd66cc55
Commit fd66cc55 authored Nov 22, 2013 by Andrew Kuchling
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Misc/ACKS Misc/ACKS +1 -1

No files found.
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1186,7 +1186,6 @@ Pete Shinners
 Michael Shiplett
 John W. Shipman
 Joel Shprentz
-Itamar Shtull-Trauring
 Yue Shuaijie
 Terrel Shumway
 Eric Siegerman
@@ -1316,6 +1315,7 @@ Anthony Tuininga
 Erno Tukia
 David Turner
 Stephen Turner
+Itamar Turner-Trauring
 Theodore Turocy
 Bill Tutt
 Fraser Tweedale