diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-18 19:36:41 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-18 19:36:41 -0700 |
commit | 046e5b23bb192699efad179f0de81a3d03ea1b7e (patch) | |
tree | 1a5efc953f9617b05ed750c73139736fa9dd74fc /scripts/xmppdaemon.php | |
parent | e9213043a820095cceeb6cacbfacf08bba9d3142 (diff) | |
parent | eec323b5b706b84039b3ead6e7ab8d4d6b666f1a (diff) |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'scripts/xmppdaemon.php')
0 files changed, 0 insertions, 0 deletions