diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-03 16:06:16 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-03 16:06:16 +0100 |
commit | 1322d44e8dd886c16d3edf548af37c2e3d054480 (patch) | |
tree | 6ff9f371d84546013bcbbb7ad355b0230c37b46b /core | |
parent | a6931a80e52b4bd32bf91d8d6163e82006972b83 (diff) | |
parent | 411cb70495af9f70588fa21cf6ca607e3bae9981 (diff) | |
download | prosody-1322d44e8dd886c16d3edf548af37c2e3d054480.tar.gz prosody-1322d44e8dd886c16d3edf548af37c2e3d054480.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions