diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-26 22:22:43 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-26 22:22:43 +0100 |
| commit | 8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e (patch) | |
| tree | 1c5e65e70f484393b24c0bcd9ecd9f6c30d55922 /core | |
| parent | 1f1a2de16515a5ab250965768cf76f64271f8884 (diff) | |
| parent | 42c4183e34f2a15920d3df042eed5531b552c495 (diff) | |
| download | prosody-8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e.tar.gz prosody-8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions