diff options
| author | Kim Alvefur <zash@zash.se> | 2014-04-15 21:54:44 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-04-15 21:54:44 +0200 |
| commit | 84a60172446e16818f990a3066d38fc08acbc27c (patch) | |
| tree | 072dbef45243ae261539510fcd02be042bee6ccc /core | |
| parent | 7b9657d41a814cadd72d44cba90c00e62d7952ef (diff) | |
| parent | 0f866905fd96f816b383457792f484f403709453 (diff) | |
| download | prosody-84a60172446e16818f990a3066d38fc08acbc27c.tar.gz prosody-84a60172446e16818f990a3066d38fc08acbc27c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions