diff options
| author | Vlad Glagolev | 2011-09-13 02:47:08 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2011-10-02 21:25:01 +0400 |
| commit | 53c31e3a105fb2e991c61d7faa967a273fc46b68 (patch) | |
| tree | 114a2895bf63319f46d5ed3e08c0fce06bf17b89 | |
| parent | 45d2778186ef84bc889f5f7f0db9b11dc5ec28d9 (diff) | |
fixed conflict
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | apache.gpg | bin | 88107 -> 93076 bytes |
2 files changed, 4 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2011-09-13 Vlad Glagolev <stealth@sourcemage.org> + * apache.gpg: added public key B55D9977 (William A. Rowe, Jr. + <wrowe@rowe-clan.net>) + 2011-08-31 Vlad Glagolev <stealth@sourcemage.org> * apache.gpg: added 791485A8 public key (Jim Jagielski (Release Signing Key) <jim@apache.org>) diff --git a/apache.gpg b/apache.gpg Binary files differindex 7c7efad7d0..67d54ccc7a 100644 --- a/apache.gpg +++ b/apache.gpg |