diff options
| author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
| commit | 763567fa0236b0b80e0271ed1d3325501b979ee1 (patch) | |
| tree | 014c49281af8df716e5b9e9de87e1c6472f91dcc /core | |
| parent | ff41d8ed2af5324b8f439a6864e41505ab778080 (diff) | |
| parent | 29326acffa1d582bed7759e6302d2c4b4bced884 (diff) | |
| download | prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.tar.gz prosody-763567fa0236b0b80e0271ed1d3325501b979ee1.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions