aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-03-31 13:21:19 +0100
committerMatthew Wild <mwild1@gmail.com>2013-03-31 13:21:19 +0100
commitc8e37d89fdf5c9b5990cd309d53707f990986559 (patch)
tree9ff644585b41124d4c2d26646b177a4b9ab2315f /prosody
parent03b2deeb6906deb9cf87dca0dcb0996510d20ea5 (diff)
parent3e788bfa6e725f53b2fa8cf062fee44160227219 (diff)
downloadprosody-c8e37d89fdf5c9b5990cd309d53707f990986559.tar.gz
prosody-c8e37d89fdf5c9b5990cd309d53707f990986559.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions