diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-21 19:45:33 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-21 19:45:33 +0100 |
| commit | 7b5c488942ef7545fca718153cb83adcf1d18a1f (patch) | |
| tree | ca92b419c05d50ee628a33316bdffccc2e3770a3 /core | |
| parent | a7048b7c938909b1fc915823b2963ae0dfcf1203 (diff) | |
| parent | 017a5331582d4dbdf0512547491c0a680db3afb2 (diff) | |
| download | prosody-7b5c488942ef7545fca718153cb83adcf1d18a1f.tar.gz prosody-7b5c488942ef7545fca718153cb83adcf1d18a1f.zip | |
Merge with backout
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions