diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-22 15:05:35 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-22 15:05:35 +0000 |
| commit | 80139e91aad31e2809038e7de13acb0e93e29635 (patch) | |
| tree | a2ae2f347c2dea808a158d622cff4d51529612ae /doc | |
| parent | 9613171fcbd245d285a95acc6cf7e3134469e5c5 (diff) | |
| parent | a5c2d24d44c1e33f04bb42e59f5fb66cdf8a31ba (diff) | |
| download | prosody-80139e91aad31e2809038e7de13acb0e93e29635.tar.gz prosody-80139e91aad31e2809038e7de13acb0e93e29635.zip | |
Merge 0.7->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions