]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'yammer' of gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 28 Sep 2010 00:26:14 +0000 (17:26 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 28 Sep 2010 00:26:14 +0000 (17:26 -0700)

Trivial merge