diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-22 14:14:33 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-22 14:14:33 -0700 |
| commit | b021cb7288f86b57d6e79df3a921afc8ed051c98 (patch) | |
| tree | d830c4e1a56e3928fc6a606e129c94ed2d1521c9 /file | |
| parent | 4c09d10025796c824c7f5d5f08a1750e4c92ba9e (diff) | |
| parent | f21cecbfbd3f641d3ad259db8c3883cd9a0382df (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
fixing up conversations
Diffstat (limited to 'file')
0 files changed, 0 insertions, 0 deletions