Commit 2503c335 authored by Brion Vibber's avatar Brion Vibber

Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

parents 027c73a4 39cad557
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