]> 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>
Wed, 13 Jan 2010 20:37:10 +0000 (12:37 -0800)
committerEvan Prodromou <evan@status.net>
Wed, 13 Jan 2010 20:37:10 +0000 (12:37 -0800)

Trivial merge