]> 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>
Thu, 24 Mar 2011 02:11:13 +0000 (22:11 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 24 Mar 2011 02:11:13 +0000 (22:11 -0400)

Trivial merge