diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:34:38 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-03-20 20:34:38 +0000 |
commit | 74531442db8df026d362695700a9ff23345dde96 (patch) | |
tree | d2c50b12dcf99d03ae30b92a7b72a9ea2203b31b /COPYING | |
parent | 58049837e7a14744f37d0250c3a854bc312d9106 (diff) | |
parent | 0c46e400afa7fef669b2f3a9ea2ed76633e8652b (diff) | |
download | prosody-74531442db8df026d362695700a9ff23345dde96.tar.gz prosody-74531442db8df026d362695700a9ff23345dde96.zip |
Merge 0.9->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions