aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-25 19:40:38 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-25 19:40:38 +0000
commit3d22f29cfab86c8a1ae34400df258a3e9b47d9ac (patch)
tree69a2008fdddde27ad2fd0b52635fa9f630fc5104 /Makefile
parenta439209b6872f72a4f2cbc1c25eeb64ee70463d2 (diff)
parentfedb8443003df7a5f87257f795f64abd05072be8 (diff)
downloadprosody-3d22f29cfab86c8a1ae34400df258a3e9b47d9ac.tar.gz
prosody-3d22f29cfab86c8a1ae34400df258a3e9b47d9ac.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions