diff options
author | Kim Alvefur <zash@zash.se> | 2014-08-13 19:22:08 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-08-13 19:22:08 +0200 |
commit | bf66f0049f2e7682ed6354388db92a2b25ea67b6 (patch) | |
tree | ab884166d151a66b7774d1a88400fb6a536120ae /Makefile | |
parent | 7eb2ec7a56e3ffca8ddbe06ece12ba20c4125fac (diff) | |
parent | 44a989459cd0943b099df727214fc04a0f87d3b3 (diff) | |
download | prosody-bf66f0049f2e7682ed6354388db92a2b25ea67b6.tar.gz prosody-bf66f0049f2e7682ed6354388db92a2b25ea67b6.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions