summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-08-11 13:44:45 -0400
committerTres Seaver <tseaver@palladion.com>2013-08-11 13:44:45 -0400
commit92bb9a02d22bb016021278056f4702dbbb1cc22d (patch)
tree4060432bc9c25b136c18d6d6019677fee978bf8f
parent0b175c6e675391cbc7a4ad56b265dcbc2c5aa976 (diff)
parentc801c78232458cbb5297bebac6ca4795ac2878c1 (diff)
downloadpyramid-92bb9a02d22bb016021278056f4702dbbb1cc22d.tar.gz
pyramid-92bb9a02d22bb016021278056f4702dbbb1cc22d.tar.bz2
pyramid-92bb9a02d22bb016021278056f4702dbbb1cc22d.zip
Merge junaidali-master branch.
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index a9396b25e..4a4adbfc4 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -204,3 +204,5 @@ Contributors
- Laurence Rowe, 2013/04/24
- Julian P. Glass, 2013/08/10
+
+- Junaid Ali, 2013/08/10