]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Fri, 29 Jan 2010 20:16:24 +0000 (15:16 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 29 Jan 2010 20:16:24 +0000 (15:16 -0500)

Trivial merge