aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-11 22:32:17 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-11 22:32:17 +0000
commit0b0e5d0825a2fa2b7ef28423824886b30bb916d7 (patch)
treefafb81c87c0f7408e936a1df9f7f3d4a7c754b37 /prosody
parent935e515d111d931801910d19771023afffc102d3 (diff)
parent02a0ea1c2a31f4cbb28b862eba1c23b248e35cab (diff)
downloadprosody-0b0e5d0825a2fa2b7ef28423824886b30bb916d7.tar.gz
prosody-0b0e5d0825a2fa2b7ef28423824886b30bb916d7.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions