diff options
author | Kim Alvefur <zash@zash.se> | 2016-05-04 16:58:25 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-05-04 16:58:25 +0200 |
commit | 4c1aa4d4ee89dcd4738c73a29e7c13774428b9ba (patch) | |
tree | 4069efefa5eba71585ead8faa0cbe970de5dcecd /Makefile | |
parent | ea6f8f4f6ac68d671fa09ec177617e781e4a915f (diff) | |
parent | b919112a2e1e1ce92a6abb073ec56cda2b6afb8e (diff) | |
download | prosody-4c1aa4d4ee89dcd4738c73a29e7c13774428b9ba.tar.gz prosody-4c1aa4d4ee89dcd4738c73a29e7c13774428b9ba.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions