diff options
author | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-18 14:50:47 -0400 |
---|---|---|
committer | Pablo Lezaeta <prflr88@gmail.com> | 2012-07-18 14:50:47 -0400 |
commit | a05a292af72f2a4269ff02850cac31599878a3a8 (patch) | |
tree | 181aa59662ba13f391bf7be9c1a2f0d7ce838e0a /CREDITS | |
parent | 10cc33f87aac4a8fb7d553a974cccaedf8852c8d (diff) | |
parent | 839f0b20e8e4982da6a152bd6d702b699d352324 (diff) | |
download | ponysay-a05a292af72f2a4269ff02850cac31599878a3a8.tar.gz ponysay-a05a292af72f2a4269ff02850cac31599878a3a8.tar.bz2 ponysay-a05a292af72f2a4269ff02850cac31599878a3a8.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,10 +7,10 @@ Sven-Hendrik Haase Jan Alexander Steffens # Patchers and other contributors +Elis Axelsson Duane Bekaert Pablo Lezaeta Kyah Rindlisbacher James Ross-Gowan Louis Taylor -Elis Jannis |