diff options
author | Kim Alvefur <zash@zash.se> | 2013-10-06 23:53:15 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-10-06 23:53:15 +0200 |
commit | 8463f5b4978d92484f85cb3f3c3f08b4f7bb310e (patch) | |
tree | 1ccbde825f880f744b016ca177445a7de83a00e5 /COPYING | |
parent | 8754e4be8504fbdbdd796818d2ce68bb02e104e5 (diff) | |
parent | 04699a3aa4f2f86e841941ad49a02d2f5f21f8fc (diff) | |
download | prosody-8463f5b4978d92484f85cb3f3c3f08b4f7bb310e.tar.gz prosody-8463f5b4978d92484f85cb3f3c3f08b4f7bb310e.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions