diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-01-31 23:17:11 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-01-31 23:17:11 +0000 |
commit | 373838b53ab87ac57830e2e833ddf78671101f72 (patch) | |
tree | 8d29f8c218d9a0115a2140287398ab4b31fcf576 /prosody | |
parent | d76f04e84ecd78b6b9b0e2e354d51a847491fea4 (diff) | |
parent | 22bd191f8634a478a7b2ca1a020270471bcd08c6 (diff) | |
download | prosody-373838b53ab87ac57830e2e833ddf78671101f72.tar.gz prosody-373838b53ab87ac57830e2e833ddf78671101f72.zip |
Merge 0.8->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions