diff options
author | Waqas Hussain <waqas20@gmail.com> | 2014-12-16 18:33:54 -0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2014-12-16 18:33:54 -0500 |
commit | 6db8f941f1437a02b380710df0e22e2a5e76568d (patch) | |
tree | dcafd2057d83c1a967fe5381adba1478d7e22001 /plugins/adhoc | |
parent | ac568342e55017173a1751565ba4ab18f7f0e11e (diff) | |
parent | 7aa032e7652834c2feac726ed1276c941e1dfb3f (diff) | |
download | prosody-6db8f941f1437a02b380710df0e22e2a5e76568d.tar.gz prosody-6db8f941f1437a02b380710df0e22e2a5e76568d.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions