]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Wed, 3 Feb 2010 16:53:54 +0000 (11:53 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 3 Feb 2010 16:53:54 +0000 (11:53 -0500)

Trivial merge