diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-12 02:23:29 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-12 02:23:29 +0000 |
commit | ccbb44a824513de54767d9442ab9b012d81f6b1f (patch) | |
tree | b88d7632488c3ce383c723be20db538dd29ade44 /COPYING | |
parent | 7ab93b50b0c0f8592fb036cdc45e3b8a620d2f91 (diff) | |
parent | cb224e1c036d6270200f90f1b836c4447270e804 (diff) | |
download | prosody-ccbb44a824513de54767d9442ab9b012d81f6b1f.tar.gz prosody-ccbb44a824513de54767d9442ab9b012d81f6b1f.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions