diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-26 14:15:38 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-26 14:15:38 +0100 |
| commit | 6608113463a183a7cc7b781f402056a7a6f5d367 (patch) | |
| tree | ef4b387b06b3d7a01769c3281ec3e928cd7c3385 /core | |
| parent | e02f10f2e89143ed0355996deb52df4ed2d2efde (diff) | |
| parent | 11babda38656a487262f9458a531601ab0fc7738 (diff) | |
| download | prosody-6608113463a183a7cc7b781f402056a7a6f5d367.tar.gz prosody-6608113463a183a7cc7b781f402056a7a6f5d367.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions