aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-07 13:23:04 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-07 13:23:04 +0100
commitee940bd4e5b8b0f3a3792422d9e93c9dba8b0126 (patch)
tree8c171b87d046de6763e46609d1fe5f4af3d04e40 /core
parent94cef42f727ed438ac4ca938a5b6d5a04577aba5 (diff)
parent3d65d794a042aa82bbfd1766b616498aba97bdc5 (diff)
downloadprosody-ee940bd4e5b8b0f3a3792422d9e93c9dba8b0126.tar.gz
prosody-ee940bd4e5b8b0f3a3792422d9e93c9dba8b0126.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions