]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 16 Mar 2011 19:00:22 +0000 (15:00 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 16 Mar 2011 19:00:22 +0000 (15:00 -0400)

Trivial merge