summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2012-11-12 11:53:18 -0600
committerMichael Merickel <michael@merickel.org>2012-11-12 11:53:18 -0600
commitcdfa9d1df1bd7aa53921a0ebaa202272e684eb2e (patch)
treeb6c18b81c7a74f933f1606a8d6c7f7f0f6b18a17 /CONTRIBUTORS.txt
parentd8d3a919f6a2a17db7ef20cea9a867bc0ec714a5 (diff)
parent18a9aed5810a5680fc027b8c55c10bd67616d1b0 (diff)
downloadpyramid-cdfa9d1df1bd7aa53921a0ebaa202272e684eb2e.tar.gz
pyramid-cdfa9d1df1bd7aa53921a0ebaa202272e684eb2e.tar.bz2
pyramid-cdfa9d1df1bd7aa53921a0ebaa202272e684eb2e.zip
Merge branch 'fix.516' of rob0t7/pyramid into pull.720
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d03da3e62..34d904d0f 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -188,3 +188,5 @@ Contributors
- Domen Kozar, 2012/09/11
- David Gay, 2012/09/16
+
+- Robert Jackiewicz, 2012/11/12