aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-18 02:48:52 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-18 02:48:52 +0100
commit13c1162f2fbba04baa1bb01712fdab305ec5f1aa (patch)
tree3335bba4f98bba077b5bfabee088476ef17086e6 /prosody
parent0040bc6b93bffd49c98789ca1fd8c4d90b4b8051 (diff)
parent97c697c83e00be46bb38e8b5e972f36aa900582e (diff)
downloadprosody-13c1162f2fbba04baa1bb01712fdab305ec5f1aa.tar.gz
prosody-13c1162f2fbba04baa1bb01712fdab305ec5f1aa.zip
Merge with 0.5
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions