]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorCraig Andrews <candrews@integralblue.com>
Mon, 16 Nov 2009 20:53:09 +0000 (15:53 -0500)
committerCraig Andrews <candrews@integralblue.com>
Mon, 16 Nov 2009 20:53:09 +0000 (15:53 -0500)

Trivial merge