aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-18 14:03:35 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-18 14:03:35 +0000
commit8c0392226672520d8a4a59e7f2544a2d4297d739 (patch)
treecc8a353f9fd1d39993e99256dd784e813d0e4153 /Makefile
parent401fde4ef607e993432c50ee2b23e6b34a5746ea (diff)
parent3b6bbde55c734ea709db7dbb3d7e293fa6440220 (diff)
downloadprosody-8c0392226672520d8a4a59e7f2544a2d4297d739.tar.gz
prosody-8c0392226672520d8a4a59e7f2544a2d4297d739.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions