diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-01-27 20:38:09 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-01-27 20:38:09 +0000 |
commit | fcf557af0bdcd02b9ff50cd545e2bf5e2d7c34a1 (patch) | |
tree | ef4b387b06b3d7a01769c3281ec3e928cd7c3385 /CHANGES | |
parent | acfde68f955864f2c08a3e6e85f7c95e1d7bd949 (diff) | |
parent | 3f77a14ef68bb213abe0e00c237853be652ddc87 (diff) | |
download | prosody-fcf557af0bdcd02b9ff50cd545e2bf5e2d7c34a1.tar.gz prosody-fcf557af0bdcd02b9ff50cd545e2bf5e2d7c34a1.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions