diff options
| author | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-08-03 16:05:03 -0700 |
| commit | 9f0715a9935966f3ec483bccc476d5baf3324b3c (patch) | |
| tree | 9874247927e5e24044c75a48a9c04e427b0ba477 /plugins/Xmpp | |
| parent | 004e42e3e0606f0f9e5c8b6cd4512e5d870cd56e (diff) | |
| parent | b17fc0ca5b90d2cdc957ebc4870fbd2791b9e1b9 (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'plugins/Xmpp')
0 files changed, 0 insertions, 0 deletions