diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-09-12 22:31:25 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-09-12 22:31:25 +0100 |
commit | fa1559e19cb42b43dac7b27213639071cd257462 (patch) | |
tree | 1b740492720e5c386b928514e711e90e705f5693 /Makefile | |
parent | 804406e5f8ae306cbb5770c38720c09cbb6c43c1 (diff) | |
parent | f04d5613829f64ceed87e0652fcbcd6f602833d3 (diff) | |
download | prosody-fa1559e19cb42b43dac7b27213639071cd257462.tar.gz prosody-fa1559e19cb42b43dac7b27213639071cd257462.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions