diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-04-03 23:09:59 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-04-03 23:09:59 +0100 |
| commit | 474f0d46466077959d3cff8ed4f51bebdda835db (patch) | |
| tree | 266e3395805b6fcea3d7a01dcda27037d2f09fb9 /core | |
| parent | af3bc714626c4e7b5299ef675bb244e963c1cfaa (diff) | |
| parent | 89e9f18d2ac62feb42a56a87ef0836a886da5d76 (diff) | |
| download | prosody-474f0d46466077959d3cff8ed4f51bebdda835db.tar.gz prosody-474f0d46466077959d3cff8ed4f51bebdda835db.zip | |
Merge 0.7->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions