aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-03-28 09:51:03 -0400
committerMatthew Wild <mwild1@gmail.com>2013-03-28 09:51:03 -0400
commit03b2deeb6906deb9cf87dca0dcb0996510d20ea5 (patch)
tree6e89afeabc71219c5c683df946478f89ff6dcd37 /prosody
parentf3a0d32fa9f7ce98757d20d39311fa1355b57eb9 (diff)
parent1ffb32ffca4a61c4a30de7c528c4891517c39709 (diff)
downloadprosody-03b2deeb6906deb9cf87dca0dcb0996510d20ea5.tar.gz
prosody-03b2deeb6906deb9cf87dca0dcb0996510d20ea5.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions