diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-24 19:46:12 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-24 19:46:12 +0100 |
| commit | 6dd7c1aa05116fb9a331542a67bfaf8a25946a73 (patch) | |
| tree | c7a6f242f1445f958c2ab4da26fb7bab12f430fc /prosody | |
| parent | e97ee0eaad41b33c15b562dadb539828e429db84 (diff) | |
| parent | a48703aa3b3006d66c7e0e685fa13fc6723c936d (diff) | |
| download | prosody-6dd7c1aa05116fb9a331542a67bfaf8a25946a73.tar.gz prosody-6dd7c1aa05116fb9a331542a67bfaf8a25946a73.zip | |
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions