diff options
| author | Kim Alvefur <zash@zash.se> | 2016-05-30 13:17:28 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-05-30 13:17:28 +0200 |
| commit | 6dbbb8fe6efc5a482d693860e5b716b3560f3739 (patch) | |
| tree | 8725903a32a44843a489748ade1914fefe5681fb /prosody | |
| parent | 0963de2358412e9c7591a1aa7f2ba5ac5aa3df76 (diff) | |
| parent | 45079c02ef1f4edfca446c08a916c61fbf7af9df (diff) | |
| download | prosody-6dbbb8fe6efc5a482d693860e5b716b3560f3739.tar.gz prosody-6dbbb8fe6efc5a482d693860e5b716b3560f3739.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions