aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-07 02:43:57 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-07 02:43:57 +0100
commit9726ab31dbf3a4874ce78e1bd5174f80a366cdd5 (patch)
tree1d1c716a40bc81e050185e108df23b86bc6cb393 /prosody
parent67f8011e81614c5bf876f983990915b8641fcde3 (diff)
parentd7bbafcd372997dbec05e0dec67c1da41968050f (diff)
downloadprosody-9726ab31dbf3a4874ce78e1bd5174f80a366cdd5.tar.gz
prosody-9726ab31dbf3a4874ce78e1bd5174f80a366cdd5.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions