diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-28 15:11:33 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-28 15:11:33 +0100 |
| commit | 3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b (patch) | |
| tree | b4f0b153db833962180e02e297b58bc1b73354ed /core | |
| parent | 3dd8fb807416165eb0b78a4c9c06e76e1f11c87f (diff) | |
| parent | aeba75d2f4582149a65437cdd6685b7188c4f984 (diff) | |
| download | prosody-3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b.tar.gz prosody-3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions