]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorSarven Capadisli <csarven@status.net>
Thu, 28 Jan 2010 18:37:31 +0000 (19:37 +0100)
committerSarven Capadisli <csarven@status.net>
Thu, 28 Jan 2010 18:37:31 +0000 (19:37 +0100)

Trivial merge