diff options
author | Kim Alvefur <zash@zash.se> | 2012-11-23 01:51:53 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2012-11-23 01:51:53 +0100 |
commit | 42c35b589bb632bddbf14d7a8569b71be8d461f5 (patch) | |
tree | 435a265cd55603c63669c3d498ba7cbaac4f9bd0 /COPYING | |
parent | fa1aed4db29880ce158b889852899fa45c7dd88b (diff) | |
parent | ecd82d4f6106bf1d76f046f6a360a0ce084b1d1b (diff) | |
download | prosody-42c35b589bb632bddbf14d7a8569b71be8d461f5.tar.gz prosody-42c35b589bb632bddbf14d7a8569b71be8d461f5.zip |
Merge 0.9->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions