diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:44:58 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:44:58 +0000 |
commit | 2688cefaa1c82f82ce2700db8055f9868ca471d1 (patch) | |
tree | 780d6035d4a4b758b773a8c2aaea79c554184cf5 /plugins/mod_pubsub | |
parent | 60930944219fcc8ff4bdb90e56a901a13f21c21d (diff) | |
parent | f307f2a4a62f2d05b9dd462045a2678b58c0c25d (diff) | |
download | prosody-2688cefaa1c82f82ce2700db8055f9868ca471d1.tar.gz prosody-2688cefaa1c82f82ce2700db8055f9868ca471d1.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_pubsub')
0 files changed, 0 insertions, 0 deletions