diff options
| author | Brion Vibber <brion@pobox.com> | 2010-12-20 14:23:15 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-12-20 14:23:15 -0800 |
| commit | b83e7005ed9dfe8675f9fbbae00650a8c6a62511 (patch) | |
| tree | d18c914503b1d4f0527174a866a3434b110400c0 /plugins/Imap/locale | |
| parent | c71d701a3f32472bb71ae38d21a4dd16ea1dcb97 (diff) | |
| parent | 46123e37543be4ea784e90528176fd205bfece49 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OStatus/classes/FeedSub.php
Diffstat (limited to 'plugins/Imap/locale')
0 files changed, 0 insertions, 0 deletions