]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Fri, 22 Oct 2010 01:16:35 +0000 (18:16 -0700)
committerZach Copley <zach@status.net>
Fri, 22 Oct 2010 01:16:35 +0000 (18:16 -0700)

Trivial merge