diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-14 00:22:56 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-14 00:22:56 +0200 |
commit | 26b55b19d692b66c9f09a933c419641af863e94a (patch) | |
tree | 138caf13843596c4aaf96f61da26a2da69fa8ea2 /prosody | |
parent | 6e1bf7233685953e586445fc812c84927b6ae990 (diff) | |
parent | a1856627f59745d91f4960afedbe95c6113f2b95 (diff) | |
download | prosody-26b55b19d692b66c9f09a933c419641af863e94a.tar.gz prosody-26b55b19d692b66c9f09a933c419641af863e94a.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions