aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-24 22:41:43 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-24 22:41:43 +0000
commit3487bfbd547efbdb6021f24b517c15ba08ee84db (patch)
tree7f56b1cea38c4cc972015bb0cde0d022cd668afe /Makefile
parente9210ce2e777ed966cc4e80df96582e84d0d2ae8 (diff)
parent808ba7e691f4fbc36a380204ea4cce1c46d9b69b (diff)
downloadprosody-3487bfbd547efbdb6021f24b517c15ba08ee84db.tar.gz
prosody-3487bfbd547efbdb6021f24b517c15ba08ee84db.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions