diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-18 12:17:06 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-18 12:17:06 +0100 |
commit | 8e6f8d978c961c37f2ccb306de43f35de885f370 (patch) | |
tree | bbb0e7b1381b3854e36bad07de070a025ea8e5a7 /doc | |
parent | 7c51e9ec71239580290b99267bb959d2c5c3bdd8 (diff) | |
parent | 34fd62b3ff8335d867aff6aecfb95b6b73a64a93 (diff) | |
download | prosody-8e6f8d978c961c37f2ccb306de43f35de885f370.tar.gz prosody-8e6f8d978c961c37f2ccb306de43f35de885f370.zip |
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions