]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'yammer-master'
authorBrion Vibber <brion@pobox.com>
Tue, 28 Sep 2010 14:45:43 +0000 (07:45 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 28 Sep 2010 14:45:43 +0000 (07:45 -0700)

Trivial merge