]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorJames Walker <walkah@walkah.net>
Thu, 29 Jul 2010 20:33:08 +0000 (16:33 -0400)
committerJames Walker <walkah@walkah.net>
Thu, 29 Jul 2010 20:33:08 +0000 (16:33 -0400)

Trivial merge