diff options
author | Kim Alvefur <zash@zash.se> | 2012-11-25 05:12:46 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-11-25 05:12:46 +0100 |
commit | 78312445a7152c50a77b902bf763310bdae925f0 (patch) | |
tree | a9ebafe6d9fb94de06b1f494b0ddad224f284c02 /core | |
parent | 7d8a4f67a2ce94a4ea70ddfbceddbb19ad0c5500 (diff) | |
parent | bfd3085f782460b3f45f99c48961e974858d2237 (diff) | |
download | prosody-78312445a7152c50a77b902bf763310bdae925f0.tar.gz prosody-78312445a7152c50a77b902bf763310bdae925f0.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions