]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 16 Mar 2011 13:52:35 +0000 (09:52 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 16 Mar 2011 13:52:35 +0000 (09:52 -0400)

Trivial merge