]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:04:54 +0000 (16:04 -0700)
committerEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:04:54 +0000 (16:04 -0700)

Trivial merge