diff options
| author | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
| commit | 58b46e2d6c3230cbef1bf62f90da3a9d329c1dea (patch) | |
| tree | b18cb027c5578a9efd74e0e4bea0b0d4401abdec /prosody | |
| parent | 4085591233dccaa78abdbf8a43007f08c8426d5e (diff) | |
| parent | 3cfe230bd0725c3c3cc3aacb97f11edf12da8305 (diff) | |
| download | prosody-58b46e2d6c3230cbef1bf62f90da3a9d329c1dea.tar.gz prosody-58b46e2d6c3230cbef1bf62f90da3a9d329c1dea.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions