]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Tue, 4 May 2010 16:15:37 +0000 (09:15 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 4 May 2010 16:15:37 +0000 (09:15 -0700)

Trivial merge