aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-01-21 03:26:04 +0000
committerMatthew Wild <mwild1@gmail.com>2014-01-21 03:26:04 +0000
commit4159b9cfe19ede5b674a3328944c4ca02de99cd7 (patch)
tree19584e158c81d91f0bc306d1969d355b454e21be /prosody
parented8030da5147e3ef3fdf13327e69a3a3f31e7dac (diff)
parent9498616c812b820d54e9e15372b9dafe9aa00a03 (diff)
downloadprosody-4159b9cfe19ede5b674a3328944c4ca02de99cd7.tar.gz
prosody-4159b9cfe19ede5b674a3328944c4ca02de99cd7.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions