]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'realtimeajax' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Jul 2009 19:33:23 +0000 (15:33 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Jul 2009 19:33:23 +0000 (15:33 -0400)

Trivial merge