]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Wed, 16 Sep 2009 15:51:19 +0000 (11:51 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 16 Sep 2009 15:51:19 +0000 (11:51 -0400)

Trivial merge