diff options
author | Kim Alvefur <zash@zash.se> | 2012-11-23 01:51:53 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-11-23 01:51:53 +0100 |
commit | 6896ddaea37097cf8252f94750f3a57c29ded584 (patch) | |
tree | 435a265cd55603c63669c3d498ba7cbaac4f9bd0 /core | |
parent | 97123dfead3682296982ba4ff194c46e415165d1 (diff) | |
parent | 6890dbd62f8dd36799ef6f17579729b95c57e015 (diff) | |
download | prosody-6896ddaea37097cf8252f94750f3a57c29ded584.tar.gz prosody-6896ddaea37097cf8252f94750f3a57c29ded584.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions