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

Trivial merge