diff options
| author | Kim Alvefur <zash@zash.se> | 2014-05-24 01:27:09 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-05-24 01:27:09 +0200 |
| commit | 66aebcb1089d4d10ffeea81a8abfc1fa294449ba (patch) | |
| tree | b9f0454fc3db32381d1c334264a070d920ece848 /core | |
| parent | b5a72ce69dcaa31dc6e626956144c579c04fdc72 (diff) | |
| parent | a9cb63cf3694f651b500e207639ebd52e9866216 (diff) | |
| download | prosody-66aebcb1089d4d10ffeea81a8abfc1fa294449ba.tar.gz prosody-66aebcb1089d4d10ffeea81a8abfc1fa294449ba.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions