aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-08-31 20:25:13 -0400
committerMatthew Wild <mwild1@gmail.com>2011-08-31 20:25:13 -0400
commit3ecd52430f326023cbf4bfd3dfc8d8ab24efa9e4 (patch)
treeeed809abc6f65e575efdc46d3e5486bde1d60622 /prosody
parent7856c56c8ad98a47dcb3712e0ab733646efda587 (diff)
parentb1f6d9e3c0e73baa22a0f8360c43fe724baccac8 (diff)
downloadprosody-3ecd52430f326023cbf4bfd3dfc8d8ab24efa9e4.tar.gz
prosody-3ecd52430f326023cbf4bfd3dfc8d8ab24efa9e4.zip
Merge with trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions