diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml index 8cbe36e079..e13c4ab344 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.committers.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml @@ -926,6 +926,10 @@ &a.jmelo.email; + + &a.mmel.email; + + &a.jmmv.email; diff --git a/share/pgpkeys/mmel.key b/share/pgpkeys/mmel.key new file mode 100644 index 0000000000..b548ed5248 --- /dev/null +++ b/share/pgpkeys/mmel.key @@ -0,0 +1,59 @@ + + + +uid Michal Meloun +uid Michal Meloun +sub rsa2048/62E61A1BD4E386E2 2015-10-26 [expires: 2018-10-31] + +]]> + diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml index d90a9257d5..5c666102de 100644 --- a/share/pgpkeys/pgpkeys-developers.xml +++ b/share/pgpkeys/pgpkeys-developers.xml @@ -1386,6 +1386,11 @@ &pgpkey.jmelo; + + &a.mmel.email; + &pgpkey.mmel; + + &a.jmmv.email; &pgpkey.jmmv; diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent index d23a944a50..43322e53af 100644 --- a/share/pgpkeys/pgpkeys.ent +++ b/share/pgpkeys/pgpkeys.ent @@ -309,6 +309,7 @@ + diff --git a/share/xml/authors.ent b/share/xml/authors.ent index 2ee4e78f3c..b7c5333eb2 100644 --- a/share/xml/authors.ent +++ b/share/xml/authors.ent @@ -1482,6 +1482,9 @@ mm@FreeBSD.org"> + +mmel@FreeBSD.org"> + mmoll@FreeBSD.org"> diff --git a/share/xml/news.xml b/share/xml/news.xml index d44affaf0b..3f73fdcd8e 100644 --- a/share/xml/news.xml +++ b/share/xml/news.xml @@ -31,6 +31,19 @@ 2015 + + 11 + + + 1 + + +

New committer: + Michal Meloun (src)

+
+
+
+ 10