git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 480eeb1b authored by Evan Prodromou's avatar Evan Prodromou

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

Conflicts:
	plugins/Realtime/realtimeupdate.js
parents 5152d31d 13976f57
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