aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-03 05:35:22 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-03 05:35:22 +0100
commite089f2d554d072b6c7393639c0f8daa8a6424d5e (patch)
tree51cbd6537abe871b1a2c0728644d4ed781c01e1e /prosody
parent8f23723f94af0fd03541b33e0a4e647dfc743d00 (diff)
parent903ddd9e5a7489ba85dfc7820c7803c4cc3011b4 (diff)
downloadprosody-e089f2d554d072b6c7393639c0f8daa8a6424d5e.tar.gz
prosody-e089f2d554d072b6c7393639c0f8daa8a6424d5e.zip
Merge 0.8->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions