]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorSamantha Doherty <sammy@status.net>
Wed, 13 Jul 2011 22:10:24 +0000 (18:10 -0400)
committerSamantha Doherty <sammy@status.net>
Wed, 13 Jul 2011 22:10:24 +0000 (18:10 -0400)

Trivial merge