Software / code / prosody
Diff
AUTHORS @ 1229:331a68645f67
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 May 2009 22:06:21 +0100 |
| parent | 792:57c793b1575f |
| child | 5403:d7ecf6cd584e |
