diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-19 17:10:42 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-19 17:10:42 +0200 |
commit | fff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9 (patch) | |
tree | 63c64dc8427c6d987cd53d489e228d097b87612f /Makefile | |
parent | 8a4e25d8a8360b82f8c7431be8babaa87e95b454 (diff) | |
parent | acd12fcc61d2e0a23db0b938fbb0ed0215f86c11 (diff) | |
download | prosody-fff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9.tar.gz prosody-fff25bc9b5828f3b5dd8fca6e5cd05b04feb2cf9.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions