diff options
| author | Kim Alvefur <zash@zash.se> | 2014-03-09 23:48:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-03-09 23:48:32 +0100 |
| commit | 7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0 (patch) | |
| tree | bfeb64317bdac3d8e975d00d1ab26d3b7e340ce2 /core | |
| parent | 8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e (diff) | |
| parent | 9ea9c5719a2275b3ae66378619cef64a392a1fec (diff) | |
| download | prosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.tar.gz prosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions