aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-12-02 20:33:09 +0000
committerMatthew Wild <mwild1@gmail.com>2009-12-02 20:33:09 +0000
commit2370fec36d773894955fa6fbf738435856148538 (patch)
tree41dd03a5d2dd001e5c268281f4f412c565921ed7 /prosody
parent44066a08973f29598540253e317ef6f9b98d5133 (diff)
parent8c48053170aa1d6f0bfc057edf6fd7ede1c6a507 (diff)
downloadprosody-2370fec36d773894955fa6fbf738435856148538.tar.gz
prosody-2370fec36d773894955fa6fbf738435856148538.zip
Merge with Tobias
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions