aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-22 17:24:55 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-22 17:24:55 +0000
commit46c0b8c7f9adeeef3e0a22204879d82230ce3d5b (patch)
tree7ec6dd56f11455527426cce6c7f6ba499df147ac /Makefile
parenta5c2d24d44c1e33f04bb42e59f5fb66cdf8a31ba (diff)
parent7fd387c3902484577be68c4365b8aea2e5c2dd8c (diff)
downloadprosody-46c0b8c7f9adeeef3e0a22204879d82230ce3d5b.tar.gz
prosody-46c0b8c7f9adeeef3e0a22204879d82230ce3d5b.zip
Merge 0.6->0.7
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions