aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-07-22 20:29:41 +0200
committerKim Alvefur <zash@zash.se>2013-07-22 20:29:41 +0200
commit663e0d48ce37c968671d5c6ff4fa13d9b84dec69 (patch)
tree4c9f44f3548eb4deb16319ad3b8c7c4128c6b771 /Makefile
parentc98ee8bbb18a9612a032c2d0fefe41b85dd177c9 (diff)
parentea624497fb152874e62349ed70afddee6e7fc68f (diff)
downloadprosody-663e0d48ce37c968671d5c6ff4fa13d9b84dec69.tar.gz
prosody-663e0d48ce37c968671d5c6ff4fa13d9b84dec69.zip
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions