/hgadmin: 3fdd84e2919e: Merging

[Gary Kramlich]

Changeset: 3fdd84e2919e727c298e09efbbff35504c02c820
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-06-15 19:57 -0500
Branch:	 default
URL: https://hg.pidgin.im/hgadmin/rev/3fdd84e2919e

Description:

Merging

diffstat:

 keys/devs/grim/grim at cloak-ecdsa |  2 --
 keys/devs/grim/grim at cloak-rsa   |  1 -
 keys/devs/grim/old-rsa          |  2 --
 3 files changed, 0 insertions(+), 5 deletions(-)

diffs (20 lines):

diff --git a/keys/devs/grim/grim at cloak-ecdsa b/keys/devs/grim/grim at cloak-ecdsa
deleted file mode 100644
--- a/keys/devs/grim/grim at cloak-ecdsa
+++ /dev/null
@@ -1,2 +0,0 @@
-ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGeYugo8BLfA4vMgivQlLKw7H9Ioij5zQ6ydX/OvUv6RFbj4EYDVIdpAIhn/W44dlGEe2PVJg6Q9oIkkZa2/o7r6AFYen08R21uL/yPTlspph3z6miFq/KM4XsySF91ZqqrU6D1i/2GB9LD/v/gnN4aDSuInkD8RH2MyphnVo51aFXXBA== grim at cloak
-
diff --git a/keys/devs/grim/grim at cloak-rsa b/keys/devs/grim/grim at cloak-rsa
deleted file mode 100644
--- a/keys/devs/grim/grim at cloak-rsa
+++ /dev/null
@@ -1,1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC31PXDmEsj58Hp1+PFf4JuJN0gfL86JzCh6KgrjH85IqLBdG4Ga/ZOYqcC7aH1k95qY5L8eFk1HbIstihr/DUctl0YuGUrRVDkhq4lSI4AZdzTgaOsuLbgngfG/uRT+3zgB6jZQr+uBJsDHARKkZLgV32Zi9y6zS0Qr9F/7gnHIKO1uVE/KWPcfiLVGL2BXOs+0FXGvCh5E+0BodAowYFhlszn81jpCSGoJxPzZfv0p0gmY2se2ertOcUS34BseYXUDxywdUueqZM8mACBU3p31tzf6KMXrswCfTr+a1PkboCf0VGwIC/JE4aDkHA6qJtFr2JyNbMiCTUEE4SrCYqCtV4CHpAZHdgJr4SIx/sz5u35dFdj9LL/ubgG3NTk8QstK3udCSxnDwfwylDDMtFIgdJ4PUJrVpChP73GsunlhzOSy5wyvWKqTOJ9C3qwKNY9sRNIr4RvTEwzZnbj6GkeP3XGmjusQoTTpCNICHD8jik/HQReEHKdeRfZLABk9UnvVeiEJauIQAM9aMWKZ9jeUmxiaAUs/IguSqmYo+P5ZGvJCGX+dy2ppyeX5UF5PMYAxHnna+l9rw771920vFbeEJUgbHaU7XXZpHLC7iTC6fI+YAbvAsy60VhjkOyqSEOZO9N83veC5WRZ6Bf/H6xcrJzqbJMrjoq6yQ2UtgPwww== grim at cloak
diff --git a/keys/devs/grim/old-rsa b/keys/devs/grim/old-rsa
deleted file mode 100644
--- a/keys/devs/grim/old-rsa
+++ /dev/null
@@ -1,2 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1TEY6wDnXCuuBdtsfQONNm0JXji0xstSryPpQTh0Uw27UOxBe6wyEqsS/LYZyGvBD0ZDgcUXZ8VCpnR+hWufwz9zIcfc3UH3NIwmKlCpFVfYAB6rYw9xzlLuhJVNiq6BQZ790Q0WNsgtNAzzEgLZmsAYhstpu1TUzqSAfDUCOtjbkr2Dn4lk/rIMCKyaf9rHSw27Fc0ZhuoHRzTkL6HjzufCMSGNt2MxqrvvHQxoIq2IrO/35826PKGAhtziZUR9QvDrfhlbar1lecIjDT3J1t0p6q/a7yHvkuuNmUrbTZURnAEit7lGI2Qr3Sem75TqCaPrmDsDpiHmHtFoNlqG3 grim at cloak
-