]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Sun, 20 Jun 2010 18:38:27 +0000 (11:38 -0700)
committerBrion Vibber <brion@pobox.com>
Sun, 20 Jun 2010 18:38:27 +0000 (11:38 -0700)

Trivial merge