summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElisamuel Resto2010-04-29 11:12:46 -0400
committerElisamuel Resto2010-04-29 11:30:38 -0400
commit655b450f14d792e31e6174f1312933bf735fb20b (patch)
tree0b9c0f9985645fdb37cc9d48fadfbc360bce0e55
parent8d254942c0e5afb0f99d4e65975281f93cf46489 (diff)
telephony/asterisk.gpg: merged with top-level asterisk.gpg; deleted.
-rw-r--r--ChangeLog3
-rw-r--r--asterisk.gpgbin11868 -> 18921 bytes
-rw-r--r--telephony/asterisk.gpgbin11537 -> 0 bytes
3 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ba9593d98b..edd1ca1400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-29 Elisamuel Resto <ryuji@sourcemage.org>
+ * telephony/asterisk.gpg: merged with top-level asterisk.gpg; deleted.
+
2010-04-28 Elisamuel Resto <ryuji@sourcemage.org>
* http/mod_fcgid: new spell, FastCGI control daemon for Apache
diff --git a/asterisk.gpg b/asterisk.gpg
index 8487a2b8aa..190cfd7570 100644
--- a/asterisk.gpg
+++ b/asterisk.gpg
Binary files differ
diff --git a/telephony/asterisk.gpg b/telephony/asterisk.gpg
deleted file mode 100644
index 0430ac85f2..0000000000
--- a/telephony/asterisk.gpg
+++ /dev/null
Binary files differ