diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2008-12-09 20:46:19 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2008-12-09 20:46:19 -0500 |
| commit | b9fdc2c41904845a7654146326fb52969f1b44dc (patch) | |
| tree | 1e8963db8f29e693387f0b7cac9e0c48a99d48db /lib/jabber.php | |
| parent | 407ce3bd8fa6ef6fe3c73d41bb0a0d11e64bac99 (diff) | |
resolve conflicts
darcs-hash:20081210014619-5ed1f-b78d0990f80f7fee6f31424bc1e366d08767af9d.gz
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions