aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-07-03 18:13:54 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-07-03 18:13:54 +0500
commit40100bac5ca711d3b850a57f60506774fac2a084 (patch)
tree1e6149693f44c3dce5635d9e67f7b67245a6c19b /Makefile
parentb45ab38e21d7c915975a69e52bd565e6cdb75e66 (diff)
parentd6c48d6e9ea256e37ff41c07ed5e9cd77a65805c (diff)
downloadprosody-40100bac5ca711d3b850a57f60506774fac2a084.tar.gz
prosody-40100bac5ca711d3b850a57f60506774fac2a084.zip
Merge 0.7->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions