aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-19 23:45:24 +0100
committerKim Alvefur <zash@zash.se>2014-02-19 23:45:24 +0100
commit1f1a2de16515a5ab250965768cf76f64271f8884 (patch)
tree132f2dc47321aac879254664fa5c81cd818daff4 /prosody
parentf27987785f1a4cce95652eb87eea5d2281d13d4d (diff)
parent0213c9ded3d5be56806a5e9e528f61bc37331997 (diff)
downloadprosody-1f1a2de16515a5ab250965768cf76f64271f8884.tar.gz
prosody-1f1a2de16515a5ab250965768cf76f64271f8884.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions