]> 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, 3 Oct 2011 13:14:17 +0000 (09:14 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 3 Oct 2011 13:14:17 +0000 (09:14 -0400)

Trivial merge