aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-05-08 18:09:59 +0100
committerMatthew Wild <mwild1@gmail.com>2014-05-08 18:09:59 +0100
commit21b4f0514bfd35fb7ec732d49d15a6cdff95a2ca (patch)
treee489fa9811c3626353c6428617f626282a6e319d /Makefile
parent95eb3d5a0d01ac9e6670c9f5dc44752f1e1b7388 (diff)
parent09fa17a7efd4502c7fdf21ec2492946bb59239e3 (diff)
downloadprosody-21b4f0514bfd35fb7ec732d49d15a6cdff95a2ca.tar.gz
prosody-21b4f0514bfd35fb7ec732d49d15a6cdff95a2ca.zip
Merge with Prosody trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions