aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-01-13 15:29:00 +0000
committerMatthew Wild <mwild1@gmail.com>2009-01-13 15:29:00 +0000
commit4dc4d175d135e293f48ed6a15f61b19c4dafe8d7 (patch)
treec4a1aeb92f7ccaccc8fd919d065d3add4c71c12d /Makefile
parentbb7d8604f252ce84bdea1cb791114dfc40c5a958 (diff)
parent8b979ccaf40ae38dbeaa5e7a4edb2e6d760fdffa (diff)
downloadprosody-4dc4d175d135e293f48ed6a15f61b19c4dafe8d7.tar.gz
prosody-4dc4d175d135e293f48ed6a15f61b19c4dafe8d7.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions