diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-24 15:59:57 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-24 15:59:57 -0500 |
| commit | 54ebb0a2b99aa1a9a6a27b61e47d12692ded65b4 (patch) | |
| tree | 3e3a4826354925e8e3a6a8a9f64146415e844858 /plugins/Imap | |
| parent | d25bd9b2923606a9e4786e8cab3c1bd384235164 (diff) | |
| parent | 3f5ffe5c5be2290e157f6390952f75ec583b41c9 (diff) | |
Merge branch 'master' into 0.9.x
Conflicts:
lib/stompqueuemanager.php
Diffstat (limited to 'plugins/Imap')
0 files changed, 0 insertions, 0 deletions