aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-25 18:53:17 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-25 18:53:17 +0000
commita439209b6872f72a4f2cbc1c25eeb64ee70463d2 (patch)
tree897caea564bb033b3b03562a22c20128f56389c4 /Makefile
parentd06b399a17f3cb6dd362a4a97aa35e3c0d229cd5 (diff)
parentfb8aa8bc8b7c748d33f3c07a00c8d7b9f45f454f (diff)
downloadprosody-a439209b6872f72a4f2cbc1c25eeb64ee70463d2.tar.gz
prosody-a439209b6872f72a4f2cbc1c25eeb64ee70463d2.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions