Merged in [9426] from rcross@amsl.com:

    Add several 'From' options for IAD user of announcement tool.
 - Legacy-Id: 9433
Note: SVN reference [9426] has been migrated to Git commit e5309ab

Author: levkowetz

ietf/secr/announcement/forms.py

@@ -27,7 +27,7 @@
              'IETF Registrar <ietf-registrar@ietf.org>',
              'IETF Administrative Director <iad@ietf.org>',
              'IETF Executive Director <exec-director@ietf.org>',
-             'The IAOC <bob.hinden@gmail.com>',
+             'The IAOC <cgriffiths@gmail.com>',
              'The IETF Trust <ietf-trust@ietf.org>',
              'RSOC Chair <rsoc-chair@iab.org>',
              'ISOC Board of Trustees <eburger@standardstrack.com>',
@@ -61,7 +61,7 @@ def get_from_choices(user):
     elif has_role(user,'IAB Chair'):
         f = (FROM_LIST[6],)
     elif has_role(user,'IAD'):
-        f = (FROM_LIST[9],)
+        f = (FROM_LIST[9],FROM_LIST[12],FROM_LIST[18],FROM_LIST[11],)
     #RSOC Chair, IAOC Chair aren't supported by has_role()
     elif Role.objects.filter(person=person,
                              group__acronym='rsoc',