diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-29 20:11:06 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-29 20:11:06 +0000 |
commit | 89969b0c91c2cf4db6d20f0ecd78045dfccbb3e6 (patch) | |
tree | 13d5cf881ee61eaf917da190973143328e6f9697 /core | |
parent | b8ab703419322fbc54dc75fe4e3cc33f5a41d4bc (diff) | |
parent | 21287079a84cb238ed70c1e883434058c672b006 (diff) | |
download | prosody-89969b0c91c2cf4db6d20f0ecd78045dfccbb3e6.tar.gz prosody-89969b0c91c2cf4db6d20f0ecd78045dfccbb3e6.zip |
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions