aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-23 23:05:01 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-23 23:05:01 +0100
commit84b7c3f97831c15d262663f6bc58b552adb11398 (patch)
tree67f0b2680ad137ebd5cd25ae840d910088fc35e4 /doc
parent4b31a9798fee915ced267f8196af658d74075652 (diff)
parentc918263d056fa6c099bbc704d8e0a17b24d546d7 (diff)
downloadprosody-84b7c3f97831c15d262663f6bc58b552adb11398.tar.gz
prosody-84b7c3f97831c15d262663f6bc58b552adb11398.zip
Merge 0.7/waqas->0.7/MattJ
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions