aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-25 18:03:15 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-25 18:03:15 +0000
commit52d66e52676c48d453fa286be2c5587dce80afb4 (patch)
tree5e79f55f6555de26e604310a6654a494d163e913 /doc
parent43052f325355c2c5b03540119f08c38022e0a452 (diff)
parentcc932b9c970f5119b7a1ae08111814ff085b9f6d (diff)
downloadprosody-52d66e52676c48d453fa286be2c5587dce80afb4.tar.gz
prosody-52d66e52676c48d453fa286be2c5587dce80afb4.zip
Merge with 0.6
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions