From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Sat, 7 Apr 2012 17:25:39 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1ef7874ba3a416529cdb636207e1eb7fb79f41c2;hp=e69713f7d490e43797ef83b604553b3bdd10cdff;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 2bea33e18..b8f744f6b 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -81,7 +81,8 @@ nameinfo:
   paer.debian.org: Ferdinando Paër (July 1st, 1771 - May 3rd, 1839)
   paganini.debian.org: Niccolò Paganini (October 27th, 1782 - May 27th, 1840)
   parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918)
-  partch.debian.org: Harry Partch (June 24th, 1901 – September 3rd, 1974)
+  partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
+  pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
   penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528)
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633)
@@ -123,6 +124,7 @@ nameinfo:
   tartini.debian.org: Giuseppe Tartini (April 8th, 1692 - February 26th, 1770)
   tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893)
   traetta.debian.org: Tommaso Michele Francesco Saverio Traetta (March 30th, 1727 - April 6th, 1779)
+  tristano.debian.org: Gerardo Tristano (July 1st, 1955 - ongoing)
   tye.debian.org: Christopher Tye (c.1505 - 1573)
   unger.debian.org: Caroline Unger (October 28th, 1803 - March 23th, 1877)
   valente.debian.org: Vincenzo Valente (February 21st, 1855 - September 6th, 1921)
@@ -484,6 +486,7 @@ host_settings:
     parry.debian.org: mailout.debian.org
     partch.debian.org: mailout.debian.org
     paganini.debian.org: mailout.debian.org
+    pasquini.debian.org: mailout.debian.org
     penalosa.debian.org: mailout.debian.org
     pergolesi.debian.org: mailout.debian.org
     peri.debian.org: mailout.debian.org
@@ -519,6 +522,7 @@ host_settings:
     steffani.debian.org: mailout.debian.org
     tchaikovsky.debian.org: mailout.debian.org
     traetta.debian.org: mailout.debian.org
+    tristano.debian.org: mailout.debian.org
     unger.debian.org: mailout.debian.org
     villa.debian.org: mailout.debian.org
     vitry.debian.org: mailout.debian.org