aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-11-26 13:06:52 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-11-26 13:06:52 +0500
commitd3aa2ff4e6469edb368f272bec11dff9658faaa4 (patch)
tree92c34d551eee2a0f7b9fa8831508ce34faf1ec4d /core
parentb544f41cef7692b6d4672b9784637051131d03ad (diff)
parent0554c71543ee4a199b056accac6a4bc1bc26d216 (diff)
downloadprosody-d3aa2ff4e6469edb368f272bec11dff9658faaa4.tar.gz
prosody-d3aa2ff4e6469edb368f272bec11dff9658faaa4.zip
Merge with 0.6.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions