diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-12 23:25:25 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-12 23:25:25 -0800 |
| commit | e34ece8b0630394b606b57b19de58c830fad9c4d (patch) | |
| tree | d6354a6e02517dd75c32f40b1d08a4b9cffd9b11 /scripts/xmppdaemon.php | |
| parent | 392bc728c795dd50e19a56cb097ab9a64f129573 (diff) | |
| parent | ec145b73fc91dd54695dd374c8a71a11e233b8c0 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'scripts/xmppdaemon.php')
0 files changed, 0 insertions, 0 deletions