diff options
author | Evan Prodromou <evan@status.net> | 2010-03-10 14:13:02 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-10 14:13:02 -0500 |
commit | a2cc26ba8a21aa3614ebfc4a77c0bec9ffb2655d (patch) | |
tree | 76eae27ba51ae642db93f3db0a3a83fda573a352 /plugins/Blacklist | |
parent | 3fba9a16f5e908b62e486d0e0df02fcb6e0a7796 (diff) | |
parent | 69b2f19b6fef793aa607c6d8f4590b93e2565626 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/Blacklist')
0 files changed, 0 insertions, 0 deletions