diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-05-11 13:55:14 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-05-11 13:55:14 +0100 |
commit | 7a117b4f0f66a6e247080a7e01d560f59465b213 (patch) | |
tree | d722883ee5166f176f02c54365f769279a64a226 /core | |
parent | 33a4ee4b14e8ba0b22d038e06ed1daa695ce3648 (diff) | |
parent | 823ddd56b85334a138c2827a3840f8cc968378c1 (diff) | |
download | prosody-7a117b4f0f66a6e247080a7e01d560f59465b213.tar.gz prosody-7a117b4f0f66a6e247080a7e01d560f59465b213.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions