]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
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)
Conflicts:
plugins/Realtime/realtimeupdate.js


No differences found