diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-03-26 20:17:59 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-03-26 20:17:59 +0000 |
commit | de9765e47979b869c15302e9b7ebb69cc4f9503c (patch) | |
tree | 3cab508593e54c925311eb26dca38f0bc86ee3d4 /CHANGES | |
parent | 4173551bfe86132de4392086b91988ee91c46cd0 (diff) | |
parent | 71b31dde2564da080341c4b72500e3832afbfe60 (diff) | |
download | prosody-de9765e47979b869c15302e9b7ebb69cc4f9503c.tar.gz prosody-de9765e47979b869c15302e9b7ebb69cc4f9503c.zip |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions