aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-10-14 10:59:54 +0100
committerMatthew Wild <mwild1@gmail.com>2014-10-14 10:59:54 +0100
commit161f220404b6519eda9288e9a38cd0c1eb76179e (patch)
tree5ad39be8aac11ff828d4ff5a36227b480a509cb3 /Makefile
parent8e63db7b12038c71190423517851c9225777b945 (diff)
parentcb4ef2e67f00b3ae37603398270fb535a34fe011 (diff)
downloadprosody-161f220404b6519eda9288e9a38cd0c1eb76179e.tar.gz
prosody-161f220404b6519eda9288e9a38cd0c1eb76179e.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions