]> 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>
Thu, 17 Jun 2010 17:50:45 +0000 (18:50 +0100)
committerLuke Fitzgerald <lw.fitzgerald@googlemail.com>
Thu, 17 Jun 2010 17:50:45 +0000 (18:50 +0100)

Trivial merge