diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-08 00:48:15 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-08 00:48:15 +0200 |
| commit | 0bdb7ab1f9104098e894c2acd033bc205081f61a (patch) | |
| tree | bc8f7022567cc5611e86b0f5636e9d8f9f35e46f /prosody | |
| parent | fb36acd6eeb0316a068acc3ac4dd3584869500b9 (diff) | |
| parent | f345e640e57e716ccfd94c3eec2a77670e932936 (diff) | |
| download | prosody-0bdb7ab1f9104098e894c2acd033bc205081f61a.tar.gz prosody-0bdb7ab1f9104098e894c2acd033bc205081f61a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions