diff options
| author | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:15 +0100 |
|---|---|---|
| committer | Per Andersson <avtobiff@gmail.com> | 2014-01-30 01:25:15 +0100 |
| commit | c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b (patch) | |
| tree | 6c5ca20a48eb50ea000748abb5374247d6de1888 /CONTRIBUTORS | |
| parent | 973d326d7847161827a8f75b5f589008a83a342d (diff) | |
| parent | 6cff86ce6de27fbd4f9fc07716fb1205b14ffae4 (diff) | |
| download | python-bleach-c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b.tar python-bleach-c084fbcb2e2f2f167c8d65ca1ecfee406f14c24b.tar.gz | |
Merge tag 'upstream/1.4'
Upstream version 1.4
# gpg: Signature made Thu 30 Jan 2014 01:25:12 AM CET using RSA key ID 79F492F8
# gpg: Good signature from "Per Andersson <avtobiff@fripost.org>"
# gpg: aka "Per Andersson <avtobiff@debian.org>"
# gpg: aka "Per Andersson <avtobiff@gmail.com>"
# gpg: aka "Per Andersson <avtobiff@foo.nu>"
Diffstat (limited to 'CONTRIBUTORS')
| -rw-r--r-- | CONTRIBUTORS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f014916..c2d052a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3,7 +3,7 @@ within and without the Mozilla Corporation and Foundation. Lead Developer: -- James Socol <james@mozilla.com> +- James Socol <me@jamessocol.com> Contributors: @@ -23,3 +23,6 @@ Patches: - Anton Kovalyov - Mark Paschal - Alex Ehlke +- Marc DM +- mdxs +- Marc Abramowitz |