]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 12 Jan 2010 00:23:48 +0000 (16:23 -0800)
committerEvan Prodromou <evan@status.net>
Tue, 12 Jan 2010 00:23:48 +0000 (16:23 -0800)

Trivial merge