]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'statusnet/1.0.x' into irc-plugin
authorLuke Fitzgerald <lw.fitzgerald@googlemail.com>
Sat, 7 Aug 2010 20:25:56 +0000 (13:25 -0700)
committerLuke Fitzgerald <lw.fitzgerald@googlemail.com>
Sat, 7 Aug 2010 20:25:56 +0000 (13:25 -0700)

Trivial merge