diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-12-16 16:47:34 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-12-16 16:47:34 +0000 |
| commit | 50b2a1dead3ebc7d18be2025537712f650687d87 (patch) | |
| tree | 6b5dcd27b170f6ec500cf0c85ded74d400df69bd /prosody | |
| parent | e511eba924fcc3bc898cb0fd336db1f94c22b29e (diff) | |
| parent | 32e49dccd82a8e392cc20a33881644b435dc269d (diff) | |
| download | prosody-50b2a1dead3ebc7d18be2025537712f650687d87.tar.gz prosody-50b2a1dead3ebc7d18be2025537712f650687d87.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions