aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-18 10:11:11 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-18 10:11:11 +0000
commit44cd7c769cafd37edb8a74293024bbf6472077c8 (patch)
treeb0e3b13db21261ee67580f50c60aecb6df663f1b /Makefile
parent96423a139c18caacf5c18bbc3d8536b3528eac28 (diff)
parent367052b11183ae48ca5b5c38493ff22fba943b56 (diff)
downloadprosody-44cd7c769cafd37edb8a74293024bbf6472077c8.tar.gz
prosody-44cd7c769cafd37edb8a74293024bbf6472077c8.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions