merge 3.4

This commit is contained in:
Benjamin Peterson 2014-06-23 20:16:06 -07:00
commit f5c5175b47
1 changed files with 1 additions and 0 deletions

View File

@ -415,6 +415,7 @@ Arnaud Fontaine
Michael Foord
Amaury Forgeot d'Arc
Doug Fort
Chris Foster
John Fouhy
Andrew Francis
Stefan Franke