diff options
author | Kim Alvefur <zash@zash.se> | 2013-10-07 12:56:53 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-10-07 12:56:53 +0200 |
commit | a732f8846e7fcb81ca1e098b0f73fd394d11df54 (patch) | |
tree | 121f351fb160d4534449768e1c2808a66e05e74e /Makefile | |
parent | 8463f5b4978d92484f85cb3f3c3f08b4f7bb310e (diff) | |
parent | c89ca6cad504e083f310f82177d32dea0e25f462 (diff) | |
download | prosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.tar.gz prosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions