diff options
| author | Kim Alvefur <zash@zash.se> | 2014-05-06 00:37:08 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-05-06 00:37:08 +0200 |
| commit | 4085591233dccaa78abdbf8a43007f08c8426d5e (patch) | |
| tree | f433cfe2fb83116b335ecb7b110523773268c12f /net | |
| parent | 2f70dc87b20dbfbac10f637b1ed8c5619699a663 (diff) | |
| parent | fda97ec24221701d82864b0b32e2eab72d5d5b6d (diff) | |
| download | prosody-4085591233dccaa78abdbf8a43007f08c8426d5e.tar.gz prosody-4085591233dccaa78abdbf8a43007f08c8426d5e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions