Merge branch 'master' into unit-tests

This commit is contained in:
Valentin Lorentz 2010-10-20 09:49:23 +02:00
commit e93fa2b872

View File

@ -58,6 +58,7 @@ class authors(object): # This is basically a bag.
bear = Author('Mike Taylor', 'bear', 'bear@code-bear.com')
grantbow = Author('Grant Bowman', 'Grantbow', 'grantbow@grantbow.com')
stepnem = Author('Štěpán Němec', 'stepnem', 'stepnem@gmail.com')
progval = Author('Valentin Lorentz', 'ProgVal', 'progval@gmail.com')
unknown = Author('Unknown author', 'unknown', 'unknown@supybot.org')
# Let's be somewhat safe about this.