diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-06 14:50:34 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-06 14:50:34 +0200 |
| commit | 55e77cd89d5969fe0892fd573fe79be6bea9716f (patch) | |
| tree | cd0b43a82194a0ef7608dc95c0bfe129d63df0af /prosody | |
| parent | 00abdfe459607977e02a616ee738306b90ab8fd6 (diff) | |
| parent | 86ece22c8cb2ffc73d8b22f7aa8a92bdb582a5f3 (diff) | |
| download | prosody-55e77cd89d5969fe0892fd573fe79be6bea9716f.tar.gz prosody-55e77cd89d5969fe0892fd573fe79be6bea9716f.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions