diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 19:00:46 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 19:00:46 +0200 |
| commit | 72c55cf058c4c542ef63f4500ae52f26f0cce7b4 (patch) | |
| tree | 5dc4e5efd72ad25de87e42f7b51f7cd7a209a515 /prosody | |
| parent | f90697534896e28ea57c15cf29458601c655f8f1 (diff) | |
| parent | fd873c5d1338091f466e74683d85e6f1121969b1 (diff) | |
| download | prosody-72c55cf058c4c542ef63f4500ae52f26f0cce7b4.tar.gz prosody-72c55cf058c4c542ef63f4500ae52f26f0cce7b4.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions