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 | f74e377a23600b3284f2cc9c4676c9836bae9d89 (patch) | |
tree | bfeb64317bdac3d8e975d00d1ab26d3b7e340ce2 /HACKERS | |
parent | b438e60d17b5103114ff9e187d171960d88259c9 (diff) | |
parent | 9833b51da4e36251d94290577b504c9f8140d64d (diff) | |
download | prosody-f74e377a23600b3284f2cc9c4676c9836bae9d89.tar.gz prosody-f74e377a23600b3284f2cc9c4676c9836bae9d89.zip |
Merge 0.10->trunk
Diffstat (limited to 'HACKERS')
0 files changed, 0 insertions, 0 deletions