Software / code / prosody
Diff
DEPENDS @ 1759:4a280effc975
Automated merge with http://prosody.im/source/hg
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Sun, 06 Sep 2009 22:08:05 +0200 |
| parent | 447:c0dae734d3bf |
| child | 4914:2e9b16b2ae00 |
