diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
| commit | c47fa42628b2119f7e37e83f22919bc905a53624 (patch) | |
| tree | 5ae5bb832b9e41b4812e12421bb70daf1c3b7446 /prosody | |
| parent | 46105d64bf9627c8618624281c966ec784f4fc12 (diff) | |
| parent | c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (diff) | |
| download | prosody-c47fa42628b2119f7e37e83f22919bc905a53624.tar.gz prosody-c47fa42628b2119f7e37e83f22919bc905a53624.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions