aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-02 00:26:23 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-02 00:26:23 +0100
commit0ffdcd1dd76f1fb6e8e9d2cc3540e5b472dc6e60 (patch)
tree96cc3f29bb9c2c695b03c3626baf6e66a1be7e4d /prosody
parent3356b04bde1a00a0bafc47f554da1e917dc7ab58 (diff)
parent649aa772aadb66ccd8773e81c6981be057a3addb (diff)
downloadprosody-0ffdcd1dd76f1fb6e8e9d2cc3540e5b472dc6e60.tar.gz
prosody-0ffdcd1dd76f1fb6e8e9d2cc3540e5b472dc6e60.zip
Merge 0.7->0.8
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions