diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-04-11 01:20:20 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-04-11 01:20:20 +0100 |
commit | 41d92dbecaab314eded4335a905e0bf3dfa3b4a1 (patch) | |
tree | 6c979aee6120ad9d5bcb354a61b61b100aedea5c /prosody | |
parent | 8d3d5fb5d7c787738fc863bfba7c48c08c2d12f7 (diff) | |
parent | 6c9b44d6303ed41676b2bb8e9bc27c457fbd9fd9 (diff) | |
download | prosody-41d92dbecaab314eded4335a905e0bf3dfa3b4a1.tar.gz prosody-41d92dbecaab314eded4335a905e0bf3dfa3b4a1.zip |
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions