diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-23 23:22:13 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-23 23:22:13 +0200 |
| commit | 733401fde5f11eec5164477a377e94c7aa109cb3 (patch) | |
| tree | 5575c703c5075d720211a69c699a333d03d00064 /prosody | |
| parent | 19e5326754d02e3a35e14bbbf25ff1c8fed1098d (diff) | |
| parent | 3e8095f15030fc121154423f65d5c7cdd5e049fd (diff) | |
| download | prosody-733401fde5f11eec5164477a377e94c7aa109cb3.tar.gz prosody-733401fde5f11eec5164477a377e94c7aa109cb3.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions