diff options
author | Kim Alvefur <zash@zash.se> | 2012-12-16 14:36:44 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-12-16 14:36:44 +0100 |
commit | ffe6907cab680f6682eb3f2c184df35f6140937b (patch) | |
tree | d7bc37853c9ea6ff217374d39cba9154b802ef0d /plugins | |
parent | aa8855f3c7d1a2e4506b66294f22a2dab5662258 (diff) | |
parent | 17bfb654dfe761450695a914b34f05b6716bd85f (diff) | |
download | prosody-ffe6907cab680f6682eb3f2c184df35f6140937b.tar.gz prosody-ffe6907cab680f6682eb3f2c184df35f6140937b.zip |
Merge 0.9->trunk
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions