diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index 8df6d88779..94fe44f50b 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -366,6 +366,10 @@ &a.scf.email; + + &a.farrokhi.email; + + &a.feld.email; diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml index 7cd13d3d6f..79c49e01f0 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml @@ -658,10 +658,6 @@ &a.mohans.email; (2006 - 2007) - - &a.farrokhi.email; (2006 - 2007) - - &a.cel.email; (2006 - 2007) diff --git a/share/pgpkeys/farrokhi.key b/share/pgpkeys/farrokhi.key index a01e16d92a..e9b7d10724 100644 --- a/share/pgpkeys/farrokhi.key +++ b/share/pgpkeys/farrokhi.key @@ -1,44 +1,160 @@ -uid Babak Farrokhi -sub 2048g/2A5F93C7 2005-12-22 +pub rsa4096/6B267AD85D632E9A 2015-07-25 [expires: 2020-07-28] + Key fingerprint = F081 5F88 61BF 2DEA F261 E9C1 6B26 7AD8 5D63 2E9A +uid Babak Farrokhi +uid Babak Farrokhi +uid Babak Farrokhi +sub rsa4096/1CB810DE7321676A 2015-07-25 [expires: 2020-07-23] + ]]>