diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:49:44 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:49:44 +0100 |
commit | 158ead42cf434bb38735bf529c3c61d6ee45e1b0 (patch) | |
tree | 1b780be536dea23b0e32d06cee9eeef6bc0ec5a1 /prosody | |
parent | 2fcd8af884edb9278d2c0cb770c879c43badd2c2 (diff) | |
parent | 9726ab31dbf3a4874ce78e1bd5174f80a366cdd5 (diff) | |
download | prosody-158ead42cf434bb38735bf529c3c61d6ee45e1b0.tar.gz prosody-158ead42cf434bb38735bf529c3c61d6ee45e1b0.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions