From: Evan Prodromou Date: Wed, 23 Sep 2009 17:51:41 +0000 (-0400) Subject: Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=480eeb1b800b77cf48111d0fa984721a171f981b;p=quix0rs-gnu-social.git Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x Conflicts: plugins/Realtime/realtimeupdate.js --- 480eeb1b800b77cf48111d0fa984721a171f981b