diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:54 +0100 |
| commit | 741b175347e86a18273060fc884b1d5c8899cc5e (patch) | |
| tree | 6eb49f8bddde74f4f7a621d0fb2770d60c093b4f /core | |
| parent | 6d743a0544280a231a08d8ab6aeedf9d57090c2a (diff) | |
| parent | a8479fce152379d3e095aa0204aa022c5b47d4e0 (diff) | |
| download | prosody-741b175347e86a18273060fc884b1d5c8899cc5e.tar.gz prosody-741b175347e86a18273060fc884b1d5c8899cc5e.zip | |
Merge 0.10 -> trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions