diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-06-22 20:01:14 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-06-22 20:01:14 (GMT) |
| commit | c234b7b4a396ce523692d5516c3cc4fb159d9d0c (patch) | |
| tree | 47f1ce749cdf31abc7b06ba6ad1b3fb493d465b5 /activities/chat | |
| parent | 0a305004b08cab01c1ae42a069d77b1517491f99 (diff) | |
| parent | be992586b1e0d849a732b44eed7047dd8be62501 (diff) | |
Merge branch 'master' of git+ssh://crank.laptop.org/git/sugar
Conflicts:
sugar/presence/Buddy.py
Diffstat (limited to 'activities/chat')
0 files changed, 0 insertions, 0 deletions