diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-09-29 10:47:37 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-09-29 10:47:37 +0100 |
commit | 4b710eec5ec25909bb7bea7afdce61f454e85259 (patch) | |
tree | 0673460c4d199012899123d4194f9715a19e1b89 /core | |
parent | 223d37a9d05b02db8610a40ae23646bde8910dc2 (diff) | |
parent | 30cc53f69a9ea9730a66ee4aa056f98185d16d39 (diff) | |
download | prosody-4b710eec5ec25909bb7bea7afdce61f454e85259.tar.gz prosody-4b710eec5ec25909bb7bea7afdce61f454e85259.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions