Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Wed, 23 Sep 2009 17:51:41 +0000 (13:51 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 23 Sep 2009 17:51:41 +0000 (13:51 -0400)
commit480eeb1b800b77cf48111d0fa984721a171f981b
tree5e2fedce90dacba856763a1cd55209b6ee533392
parent5152d31d2a4199306d656480ca5ff8d0978d8984
parent13976f5796f24725280f4ff33901349df4668f50
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x

Conflicts:
plugins/Realtime/realtimeupdate.js