aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-03 15:09:58 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-03 15:09:58 +0000
commite9c064e355fee23eca94878748b4b182d1d625ac (patch)
tree7b6d2c0f1590858ca3eaed80de5758c64b9ee328 /AUTHORS
parentf1a9c23909b5472f68a9d81c858d267c48a9405e (diff)
parent1c20002637bbd2c9cfaa951acd74ed95a0217e99 (diff)
downloadprosody-e9c064e355fee23eca94878748b4b182d1d625ac.tar.gz
prosody-e9c064e355fee23eca94878748b4b182d1d625ac.zip
Merge from waqas
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 0 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index c6665db9..8fe161bb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,5 +2,3 @@
Matthew Wild (matthew AT heavy-horse.co.uk)
Waqas Hussain (waqas20 AT gmail.com)
-Tobias Markmann (tm AT ayena.de)
-Paul-Sebastian Manole (brokenthorn AT gmail.com)