aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-11-23 16:30:34 +0000
committerMatthew Wild <mwild1@gmail.com>2009-11-23 16:30:34 +0000
commit53979a7de7baea48ede8b2a45a58127ac645d86b (patch)
treec8914591d00ee172a3ea736513271afaecc75a08 /Makefile
parent119d80071d6c91ed7d91237c6a7f9711adde8759 (diff)
parent82c595c85bd5ea8bf9dc116e3e1b9f01a56f8619 (diff)
downloadprosody-53979a7de7baea48ede8b2a45a58127ac645d86b.tar.gz
prosody-53979a7de7baea48ede8b2a45a58127ac645d86b.zip
Merge with trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions