diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-19 23:45:24 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-19 23:45:24 +0100 |
| commit | 1f1a2de16515a5ab250965768cf76f64271f8884 (patch) | |
| tree | 132f2dc47321aac879254664fa5c81cd818daff4 /core | |
| parent | f27987785f1a4cce95652eb87eea5d2281d13d4d (diff) | |
| parent | 0213c9ded3d5be56806a5e9e528f61bc37331997 (diff) | |
| download | prosody-1f1a2de16515a5ab250965768cf76f64271f8884.tar.gz prosody-1f1a2de16515a5ab250965768cf76f64271f8884.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions