aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-24 22:48:12 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-24 22:48:12 +0000
commit44fe79faff36d674623e2189f37a4e8512bc207d (patch)
tree34d50fb56d199fd5c8f68a57b9e13c1eaea024a9 /Makefile
parent3487bfbd547efbdb6021f24b517c15ba08ee84db (diff)
parentef00aa87e4adb5fbe1779e5cf67bed272d02589e (diff)
downloadprosody-44fe79faff36d674623e2189f37a4e8512bc207d.tar.gz
prosody-44fe79faff36d674623e2189f37a4e8512bc207d.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions