aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-07-02 19:55:37 +0100
committerMatthew Wild <mwild1@gmail.com>2010-07-02 19:55:37 +0100
commit423ad6b5d1e075b11b8cb7d10703a2ba07ef306b (patch)
tree109daa807d4675331721a461abff6e7f68caff18 /Makefile
parentf654c430081b0161e66e28c70e6da80a5da99250 (diff)
parent7f0f97fd7f4bfdc314ed7a071a0eefc84a18f788 (diff)
downloadprosody-423ad6b5d1e075b11b8cb7d10703a2ba07ef306b.tar.gz
prosody-423ad6b5d1e075b11b8cb7d10703a2ba07ef306b.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions