]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorSarven Capadisli <csarven@status.net>
Fri, 20 Nov 2009 05:28:54 +0000 (05:28 +0000)
committerSarven Capadisli <csarven@status.net>
Fri, 20 Nov 2009 05:28:54 +0000 (05:28 +0000)

Trivial merge