]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Wed, 25 Nov 2009 19:23:49 +0000 (19:23 +0000)
committerZach Copley <zach@status.net>
Wed, 25 Nov 2009 19:23:49 +0000 (19:23 +0000)

Trivial merge