aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-07 12:56:53 +0200
committerKim Alvefur <zash@zash.se>2013-10-07 12:56:53 +0200
commita732f8846e7fcb81ca1e098b0f73fd394d11df54 (patch)
tree121f351fb160d4534449768e1c2808a66e05e74e /Makefile
parent8463f5b4978d92484f85cb3f3c3f08b4f7bb310e (diff)
parentc89ca6cad504e083f310f82177d32dea0e25f462 (diff)
downloadprosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.tar.gz
prosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions