diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-03 23:02:36 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-03 23:02:36 +0100 |
commit | 189039bd778c59fd5cb5c366160e3223635b18b1 (patch) | |
tree | ab08d20e6221fcbbef8a751617c0a4bac36065f1 /Makefile | |
parent | 6b679da5299ada6254e8f5bf8e8e3284a812dc1d (diff) | |
parent | c32b0e36d62da5b9bcfb46bbb0f81d124e1d4f57 (diff) | |
download | prosody-189039bd778c59fd5cb5c366160e3223635b18b1.tar.gz prosody-189039bd778c59fd5cb5c366160e3223635b18b1.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions