diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-06-07 12:19:14 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-06-07 12:19:14 +0100 |
commit | 798403ee6857266c11f288946e532a325697bdb4 (patch) | |
tree | 65f01a2d0266c9db3cd0c715990c59071e8b32f1 /core | |
parent | bd5eb28b327232a6a016012368905f02a3f3be36 (diff) | |
parent | c49bc6b7102dc672237f8d4579f07bf57e6b9488 (diff) | |
download | prosody-798403ee6857266c11f288946e532a325697bdb4.tar.gz prosody-798403ee6857266c11f288946e532a325697bdb4.zip |
Merge 0.7->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions