diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-01-07 03:18:40 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-01-07 03:18:40 +0000 |
commit | c32601b14fb35115a64d977fcf8087bff572635e (patch) | |
tree | 91ab59c363f59a6eeee963f76b7bf321293f0182 /prosody | |
parent | b4101c237eccd6680323f37840b99263e7d85d47 (diff) | |
parent | 307c31a077ab9d56b21ba5f9d8f891d363636548 (diff) | |
download | prosody-c32601b14fb35115a64d977fcf8087bff572635e.tar.gz prosody-c32601b14fb35115a64d977fcf8087bff572635e.zip |
Merge 0.8->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions