aboutsummaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorPablo Lezaeta <prflr88@gmail.com>2012-07-18 15:53:43 -0400
committerPablo Lezaeta <prflr88@gmail.com>2012-07-18 15:53:43 -0400
commit3e35bb7eac0ec440a2329e81ded9de4509828494 (patch)
tree20dd09e652b9e07679b2162d13ec5821a631bf30 /CREDITS
parent998458131e5f5c59072558feb8d8b5c9fe137390 (diff)
parent4c2b7c49e79c9d1f17f560ad6a5149fc67514084 (diff)
downloadponysay-3e35bb7eac0ec440a2329e81ded9de4509828494.tar.gz
ponysay-3e35bb7eac0ec440a2329e81ded9de4509828494.tar.bz2
ponysay-3e35bb7eac0ec440a2329e81ded9de4509828494.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 4134678..aa46e41 100644
--- a/CREDITS
+++ b/CREDITS
@@ -4,12 +4,12 @@
Erkin Batu Altunbaş
Mattias Andrée
Sven-Hendrik Haase
+Pablo Lezaeta
Jan Alexander Steffens
# Patchers and other contributors
Elis Axelsson
Duane Bekaert
-Pablo Lezaeta
Kyah Rindlisbacher
James Ross-Gowan
Louis Taylor