diff options
author | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-10-26 20:58:02 +0100 |
commit | cebfb0bf3e29df5aac96cb0d41adb8e356921dc8 (patch) | |
tree | 014c49281af8df716e5b9e9de87e1c6472f91dcc /HACKERS | |
parent | f08fe049ef978fdaa00132f238d6f038605ed3a1 (diff) | |
parent | 8f2d2b9bea483c6a4cf1324af6306d60ae8d91b9 (diff) | |
download | prosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.tar.gz prosody-cebfb0bf3e29df5aac96cb0d41adb8e356921dc8.zip |
Merge 0.10->trunk
Diffstat (limited to 'HACKERS')
0 files changed, 0 insertions, 0 deletions