aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-02 15:28:12 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-02 15:28:12 +0100
commit0193bc555b8c9c4751311967e7ec951641818c65 (patch)
tree59a90d5dd9c89ffaf83436748582b20f06c1ac0e /prosody
parent7037ff8b95c6d1860b1ca9e42a9916ac237419cc (diff)
parentd90814ef61e537efb472dfe186524b254594dc62 (diff)
downloadprosody-0193bc555b8c9c4751311967e7ec951641818c65.tar.gz
prosody-0193bc555b8c9c4751311967e7ec951641818c65.zip
Merge 0.7->0.8
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions