Merge from 3.3

This commit is contained in:
Andrew Kuchling 2013-11-22 20:18:26 -05:00
commit fd66cc5534

View file

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