diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-03 02:13:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-03 02:13:03 +0100 |
| commit | c28642d749a62163213d926f9951cb2fb27c28b2 (patch) | |
| tree | b05cbe5edb0e02f9b3a9a01674912e513c64ac33 /core | |
| parent | 6a276c275d705bb72bcdc74f8450f188b3056d27 (diff) | |
| parent | 7a6002f04a754645ffbb0b0e59b939441e6a8060 (diff) | |
| download | prosody-c28642d749a62163213d926f9951cb2fb27c28b2.tar.gz prosody-c28642d749a62163213d926f9951cb2fb27c28b2.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions