]> 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>
Mon, 4 Apr 2011 20:26:26 +0000 (16:26 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 4 Apr 2011 20:26:26 +0000 (16:26 -0400)

Trivial merge