merge 3.2

This commit is contained in:
Benjamin Peterson 2012-04-23 11:25:49 -04:00
commit 99e6f87586

View file

@ -933,6 +933,7 @@ Jerry Seutter
Denis Severson
Ian Seyer
Ha Shao
Mark Shannon
Richard Shapiro
Bruce Sherwood
Alexander Shigin