diff options
author | Kim Alvefur <zash@zash.se> | 2015-04-26 00:07:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-04-26 00:07:36 +0200 |
commit | 43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3 (patch) | |
tree | b003c23950a3bb53f56cc0eedaca77b2aaf4bbe0 /prosody | |
parent | 1be7952fe226feefa784e1975d23e950323877e3 (diff) | |
parent | 3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000 (diff) | |
download | prosody-43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3.tar.gz prosody-43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions