]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'statusnet/1.0.x' into msn-plugin
authorLuke Fitzgerald <lw.fitzgerald@googlemail.com>
Tue, 29 Jun 2010 00:04:22 +0000 (17:04 -0700)
committerLuke Fitzgerald <lw.fitzgerald@googlemail.com>
Tue, 29 Jun 2010 00:04:22 +0000 (17:04 -0700)

Trivial merge