diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-03 18:39:27 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-03 18:39:27 +0200 |
commit | 8896368c298dc1d009dc56b38919e02b35f3214d (patch) | |
tree | 1db58cd52f622c3560457cf589cdc8e6326d28e6 /HACKERS | |
parent | ec503579285d613085de37168feffa3ad9ea793d (diff) | |
parent | f303d3dda826ebe6df8bc8a4534ee674291a4795 (diff) | |
download | prosody-8896368c298dc1d009dc56b38919e02b35f3214d.tar.gz prosody-8896368c298dc1d009dc56b38919e02b35f3214d.zip |
Merge 0.10->trunk
Diffstat (limited to 'HACKERS')
0 files changed, 0 insertions, 0 deletions