]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Fri, 20 Nov 2009 11:12:17 +0000 (11:12 +0000)
committerZach Copley <zach@status.net>
Fri, 20 Nov 2009 11:12:17 +0000 (11:12 +0000)

Trivial merge