diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-22 14:59:03 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-22 14:59:03 +0000 |
commit | 9613171fcbd245d285a95acc6cf7e3134469e5c5 (patch) | |
tree | 6d22aff1fd5c281d8280845d0646631ddd0e9daa /COPYING | |
parent | 02971394f90dde48ed352ebc1936258647f7ab3c (diff) | |
parent | 6fc597e709bcd9328e9309f05b55b1c2097cfebe (diff) | |
download | prosody-9613171fcbd245d285a95acc6cf7e3134469e5c5.tar.gz prosody-9613171fcbd245d285a95acc6cf7e3134469e5c5.zip |
Merge 0.7->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions