aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-10 16:48:21 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-10 16:48:21 +0100
commit365c25ed1c95c9442d145c4d8587e8da84ab1b8f (patch)
tree85ebca6903e2dab7794eae5bbc9dafee50a4d7a3
parent0929b61dbc2fc5094e041ad138bdd081b894105c (diff)
parent715918b43b7a13da56bddbd11daff1ba06b77118 (diff)
downloadprosody-365c25ed1c95c9442d145c4d8587e8da84ab1b8f.tar.gz
prosody-365c25ed1c95c9442d145c4d8587e8da84ab1b8f.zip
Merge 0.7->trunk
0 files changed, 0 insertions, 0 deletions