aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-11 22:40:41 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-11 22:40:41 +0000
commitdde898cca7be5861443d00d76fe0a73d2f33b042 (patch)
tree5bb39e0385de7c74baa32e01eb45a4793edf001b /prosody
parentcb32b466ed75d41a56e9ba5959697c326b84f8cf (diff)
parentddde44eb046ea134888b93df74021a521b737d8a (diff)
downloadprosody-dde898cca7be5861443d00d76fe0a73d2f33b042.tar.gz
prosody-dde898cca7be5861443d00d76fe0a73d2f33b042.zip
Merge 0.8->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions