diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-20 11:44:41 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-20 11:44:41 +0100 |
| commit | ac685e8a5d88a012d06fb620622d765e59054c88 (patch) | |
| tree | 621ad6715865697db07f2d7fb5bd8bd1401aad4f /prosody | |
| parent | 00bad4452993f5d32e41bcfdf69647fd81f0d70a (diff) | |
| parent | 9df44146a6b13f05b978168d1607d80841d8da2c (diff) | |
| download | prosody-ac685e8a5d88a012d06fb620622d765e59054c88.tar.gz prosody-ac685e8a5d88a012d06fb620622d765e59054c88.zip | |
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions