diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-11 23:28:53 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-11 23:28:53 +0100 |
| commit | 9ad69a00f43a989ec472c1e9d5f9f17931e52dc8 (patch) | |
| tree | b88d7632488c3ce383c723be20db538dd29ade44 /prosody | |
| parent | 2109d4abf0a687b620a3c21bfb1930bb291fa249 (diff) | |
| parent | 2d85f0a5e613260372a457ad910136ce8c7a778f (diff) | |
| download | prosody-9ad69a00f43a989ec472c1e9d5f9f17931e52dc8.tar.gz prosody-9ad69a00f43a989ec472c1e9d5f9f17931e52dc8.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions