diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 14:28:17 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-06 14:28:17 -0500 |
| commit | be6ce275387971692944c3677ea5e03f6fd038f8 (patch) | |
| tree | 8f35f787e90a522a354b8702f5e712eae8b1d6c7 /scripts/xmppconfirmhandler.php | |
| parent | 5cdead72cdee1261e506cdc89dd81242bfb9ba84 (diff) | |
| parent | adcbb483623f10fa7ed76cc85c6c20e3647fa9f3 (diff) | |
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
Conflicts:
lib/util.php
Diffstat (limited to 'scripts/xmppconfirmhandler.php')
0 files changed, 0 insertions, 0 deletions