Commit e04f5563 authored by Brion Vibber's avatar Brion Vibber

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

parents e18e659c b782225a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment