diff options
author | Kim Alvefur <zash@zash.se> | 2014-08-10 10:31:18 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-08-10 10:31:18 +0200 |
commit | e022111d6adec83637e0ba3b5d8a7f7dcf63bef4 (patch) | |
tree | 036a3694d936f4a5862d2b8c631599fddbbab355 /plugins/mod_pubsub | |
parent | 0437582ce056715d99a91bf0afe958b045d0cc6a (diff) | |
parent | aa558a1dc7bf72debc066690e43e3a6fc4be1db7 (diff) | |
download | prosody-e022111d6adec83637e0ba3b5d8a7f7dcf63bef4.tar.gz prosody-e022111d6adec83637e0ba3b5d8a7f7dcf63bef4.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_pubsub')
0 files changed, 0 insertions, 0 deletions