diff options
author | Waqas Hussain <waqas20@gmail.com> | 2010-05-01 05:18:38 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2010-05-01 05:18:38 +0500 |
commit | 3376282d8aacc5814519e16c8b04809f24b9f248 (patch) | |
tree | 7e5980dff5518468ef2d7f18b66f4826b5ab62e9 /prosody | |
parent | 2d68866021180ac35c77b6022e717bc727280177 (diff) | |
parent | 170a2e9b64199f9a72976f5e24556d30c851192e (diff) | |
download | prosody-3376282d8aacc5814519e16c8b04809f24b9f248.tar.gz prosody-3376282d8aacc5814519e16c8b04809f24b9f248.zip |
Merge 0.6 into 0.7.
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions