merge 3.3

2014-03-01 19:16:51 -05:00 · 2014-03-01 19:16:51 -05:00 · 150570a573
parent 24a945cc6b 9e90b12bb2
commit 150570a573
1 changed files with 1 additions and 0 deletions
--- a/Misc/ACKS
+++ b/Misc/ACKS
@ -40,6 +40,7 @@ Erik Andersén
 Oliver Andrich
 Ross Andrus
 Juancarlo Añez
+Chris Angelico
 Jérémy Anger
 Ankur Ankan
 Jon Anglin