diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-01-02 20:42:53 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-01-02 20:42:53 +0000 |
| commit | 8525a177737252f17ef63a09047b9bbac7f61282 (patch) | |
| tree | cb3e8bce329accde5bcfa6c8138f4868a7aa9c58 /prosody | |
| parent | 93408770ef53ce0056d7a875f79b053f218eb806 (diff) | |
| parent | 1eb8d252ea82a641caaf4996d1a9c31f62db83a2 (diff) | |
| download | prosody-8525a177737252f17ef63a09047b9bbac7f61282.tar.gz prosody-8525a177737252f17ef63a09047b9bbac7f61282.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions