]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Fri, 20 Nov 2009 16:00:34 +0000 (08:00 -0800)
committerEvan Prodromou <evan@status.net>
Fri, 20 Nov 2009 16:00:34 +0000 (08:00 -0800)

Trivial merge