summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2012-05-03 07:50:06 -0700
committerMichael Merickel <michael@merickel.org>2012-05-03 07:50:06 -0700
commit09f82e5e0290ff329b611c3ad8d1b0636005185f (patch)
treee24524ab236b46514ce94afd15414812f853e57d
parentad42cef589f37b998e804e780e92e52544ecfb16 (diff)
parente261b6f4343b83d2904bfe9481a546b7d97e7af3 (diff)
downloadpyramid-09f82e5e0290ff329b611c3ad8d1b0636005185f.tar.gz
pyramid-09f82e5e0290ff329b611c3ad8d1b0636005185f.tar.bz2
pyramid-09f82e5e0290ff329b611c3ad8d1b0636005185f.zip
Merge pull request #595 from vipera/master
Added name to CONTRIBUTORS.txt
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 4b780d3a7..98f73d5f9 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -170,3 +170,5 @@ Contributors
- Steve Piercy, 2012/03/27
- Wayne Witzel III, 2012/03/27
+
+- Marin Rukavina, 2012/05/03