diff options
author | Waqas Hussain <waqas20@gmail.com> | 2010-09-27 19:51:14 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2010-09-27 19:51:14 +0500 |
commit | 1a415139e5c71d58f7971b4850299d575e853221 (patch) | |
tree | 3be76fbb7ca14eff47d3a27367d806056d079631 /prosody | |
parent | c1bf0e726b24d2dfa856d2ca78c602619cc1e839 (diff) | |
parent | 47cddab8023afe67adefdad70cf5b3ce1de7c704 (diff) | |
download | prosody-1a415139e5c71d58f7971b4850299d575e853221.tar.gz prosody-1a415139e5c71d58f7971b4850299d575e853221.zip |
Merge with trunk.
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions