aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-11 22:31:48 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-11 22:31:48 +0000
commit02a0ea1c2a31f4cbb28b862eba1c23b248e35cab (patch)
treee918bc1917077531945dec03b0bc9381adfbe0ad /prosody
parent89969b0c91c2cf4db6d20f0ecd78045dfccbb3e6 (diff)
parent8625bc8b8f473f84da682541a7965d9aca838d40 (diff)
downloadprosody-02a0ea1c2a31f4cbb28b862eba1c23b248e35cab.tar.gz
prosody-02a0ea1c2a31f4cbb28b862eba1c23b248e35cab.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions