aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-06-29 22:49:56 +0200
committerKim Alvefur <zash@zash.se>2013-06-29 22:49:56 +0200
commit47d5c4280e30b26fd1ff3414a0dcba0c37c74e5e (patch)
treee3a5dcc3fd31246375ab425fc53a71e19860170e /Makefile
parent1ff17bd2f363d64e96b5f55c40da0768eb2931a0 (diff)
parent635415806afea781bc4c32c2cb71d5cc666aef75 (diff)
downloadprosody-47d5c4280e30b26fd1ff3414a0dcba0c37c74e5e.tar.gz
prosody-47d5c4280e30b26fd1ff3414a0dcba0c37c74e5e.zip
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions