aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-10 10:46:27 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-10 10:46:27 +0100
commit0a7aa9be7afef15a53c7f46a2a58e3381a348d36 (patch)
treed9d7540d13a8f11cafcf89a9e457ce4ae6bae0ce /Makefile
parentd0dcf0fa8c24226155f673eede1ed68d73a990c1 (diff)
parent1e820b5e1d6ad5ecc578bbb8de285f5694923a02 (diff)
downloadprosody-0a7aa9be7afef15a53c7f46a2a58e3381a348d36.tar.gz
prosody-0a7aa9be7afef15a53c7f46a2a58e3381a348d36.zip
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions