diff options
| author | Kim Alvefur <zash@zash.se> | 2013-04-09 15:51:08 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-04-09 15:51:08 +0200 |
| commit | 3e3e95de464ba6b9c4a0b2a0086dd557c87fa90f (patch) | |
| tree | 1bd41093a6d55f3960165ad5b10225a2d9e38a6c /core | |
| parent | dc40055961900d21a10d7cf64b06cbe42e003095 (diff) | |
| parent | a1ba10f6b7c70691df6e3d450dd1ca289f7e5489 (diff) | |
| download | prosody-3e3e95de464ba6b9c4a0b2a0086dd557c87fa90f.tar.gz prosody-3e3e95de464ba6b9c4a0b2a0086dd557c87fa90f.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions