aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-18 18:57:55 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-18 18:57:55 +0000
commit45a1c2555889ee909fb0b9139da56c0e1fbf12ed (patch)
treeab91034f2c769418039e704ee8069ad7245da4a2 /prosody
parent80952e2cc9c13df0a8a9ea572326f82285b05141 (diff)
parent36d1513d7fc6321c9ecd0abceac8dd0cdcbfedcc (diff)
downloadprosody-45a1c2555889ee909fb0b9139da56c0e1fbf12ed.tar.gz
prosody-45a1c2555889ee909fb0b9139da56c0e1fbf12ed.zip
Merge with 0.7
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions