aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-01-31 12:25:24 +0000
committerMatthew Wild <mwild1@gmail.com>2015-01-31 12:25:24 +0000
commit0817b4dc7ac69021ac709895016266b37ee745be (patch)
treedc4f4861f9ff4c39fb0c037e14ec6db025ef0c39 /doc
parent887c81f09119032163fda9826df0e20d067c03e0 (diff)
parentb242f3c94876f76ee7ccc5719bc1fc02c4bd0787 (diff)
downloadprosody-0817b4dc7ac69021ac709895016266b37ee745be.tar.gz
prosody-0817b4dc7ac69021ac709895016266b37ee745be.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions