aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-07-08 21:41:31 +0100
committerMatthew Wild <mwild1@gmail.com>2013-07-08 21:41:31 +0100
commit5ad0e8280273c22fef6cd5b7d915e895c3473344 (patch)
treec26e0fdeb8230cec51561eb0c5dfeda12ab1d7ce /prosody
parent717c9ba411ee82fd4c6c01db35d2b609ae049d58 (diff)
parent07891fe7e92e7fa2fa40f775f42c67036d147154 (diff)
downloadprosody-5ad0e8280273c22fef6cd5b7d915e895c3473344.tar.gz
prosody-5ad0e8280273c22fef6cd5b7d915e895c3473344.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions