diff options
| author | Chris McDonough <chrism@agendaless.com> | 2010-04-25 00:02:12 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2010-04-25 00:02:12 +0000 |
| commit | 7534bae0c5eeb34a0146e76a81a9312797f6ba5c (patch) | |
| tree | 15d3fd388eb3c5538c50da20c3691a9f39ca6de3 /COPYRIGHT.txt | |
| parent | 51981a128c7ed05e51938a3f358c0970dcc33a6f (diff) | |
| download | pyramid-7534bae0c5eeb34a0146e76a81a9312797f6ba5c.tar.gz pyramid-7534bae0c5eeb34a0146e76a81a9312797f6ba5c.tar.bz2 pyramid-7534bae0c5eeb34a0146e76a81a9312797f6ba5c.zip | |
Merge i18n branch via svn merge --ignore-ancestry -r9030:9150 $REPOZE_SVN/repoze.bfg/branches/i18n
No foreigners were harmed in the coding of this feature.
Diffstat (limited to 'COPYRIGHT.txt')
| -rw-r--r-- | COPYRIGHT.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 7b03cc535..aa870dc84 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -4,3 +4,5 @@ Copyright (c) 2008-2010 Agendaless Consulting and Contributors. Portions (c) Django Project (http://djangoproject.com/). Portions (c) Zope Foundation and contributors (http://www.zope.org/). + +Portions (c) Edgewall Software (http://edgewall.org) |