aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-22 17:26:12 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-22 17:26:12 +0000
commite9210ce2e777ed966cc4e80df96582e84d0d2ae8 (patch)
tree9a36c6329eb70d4e655dc88742cea8419f06f9c3 /Makefile
parent2c597f0fa443131956fd7e9d3ad86774f1dd7c7b (diff)
parent46c0b8c7f9adeeef3e0a22204879d82230ce3d5b (diff)
downloadprosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.tar.gz
prosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions