diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-13 22:58:53 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-13 22:58:53 -0400 |
| commit | 4b8ae3e33937b4dacd2acb17d98050684ce41823 (patch) | |
| tree | c811be150fe6cb6f761c77f1dda7d4923e68f688 /xmppdaemon.php | |
| parent | d9aea8cb9a99f3af302fc197314ba4da18e24723 (diff) | |
Resolve conflict
darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
Diffstat (limited to 'xmppdaemon.php')
0 files changed, 0 insertions, 0 deletions