diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-03-22 14:38:01 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-03-22 14:38:01 +0000 |
commit | 02971394f90dde48ed352ebc1936258647f7ab3c (patch) | |
tree | 8ebf152610862d71bb1f2d3bbb77ea96f7258c56 /doc | |
parent | 172d9baed4f493e04e93659d485f1a75624b84c1 (diff) | |
parent | c3a993d0ada1de7131b880aba84ea60a03b50873 (diff) | |
download | prosody-02971394f90dde48ed352ebc1936258647f7ab3c.tar.gz prosody-02971394f90dde48ed352ebc1936258647f7ab3c.zip |
Merge 0.7->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions