aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-13 13:56:58 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-13 13:56:58 +0100
commit965bf743a1d221cfc7d894cc10fc70db8414418f (patch)
tree840496b3acda4627207ef0f3878e30faec07986a /Makefile
parent0622bf751d357acf751cdfb4c1219749390fc11e (diff)
parent9744a0a343f6b93fecbc8715272dd493d87a075e (diff)
downloadprosody-965bf743a1d221cfc7d894cc10fc70db8414418f.tar.gz
prosody-965bf743a1d221cfc7d894cc10fc70db8414418f.zip
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions