aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-24 22:40:53 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-24 22:40:53 +0000
commit808ba7e691f4fbc36a380204ea4cce1c46d9b69b (patch)
treef3e1b92c3447f9927e655f62b1218c2fd4ed4393 /README
parentd16d14ade1716171913200e085f1af12e6c819eb (diff)
parentb0e0c82d16c2b371508d7a4db4ff3b62341ccd5d (diff)
downloadprosody-808ba7e691f4fbc36a380204ea4cce1c46d9b69b.tar.gz
prosody-808ba7e691f4fbc36a380204ea4cce1c46d9b69b.zip
Merge 0.7/waqas->0.7/MattJ
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions