]> 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>
Fri, 22 Jan 2010 19:19:08 +0000 (14:19 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 22 Jan 2010 19:19:08 +0000 (14:19 -0500)

Trivial merge