aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-05-01 05:18:38 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-05-01 05:18:38 +0500
commit3376282d8aacc5814519e16c8b04809f24b9f248 (patch)
tree7e5980dff5518468ef2d7f18b66f4826b5ab62e9 /Makefile
parent2d68866021180ac35c77b6022e717bc727280177 (diff)
parent170a2e9b64199f9a72976f5e24556d30c851192e (diff)
downloadprosody-3376282d8aacc5814519e16c8b04809f24b9f248.tar.gz
prosody-3376282d8aacc5814519e16c8b04809f24b9f248.zip
Merge 0.6 into 0.7.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions